Merge branch 'development' into feature/#16519_integrate_rb_ale

CHANGELOG.md

@@ -1,6 +1,13 @@
 cookbook-rb-manager CHANGELOG
 ===============
 
+## 1.7.9
+
+  - Miguel Álvarez
+    - [1c900b6] Update prepare_system.rb
+    - [f9d986c] Update memory_services.rb
+    - [546e802] rename to excluded_memory_services
+
 ## 1.7.8
 
   - nilsver

resources/attributes/default.rb

@@ -93,6 +93,9 @@
 default["redborder"]["memory_services"]["redborder-cep"] = {"count" => 10, "memory" => 0 }
 default["redborder"]["memory_services"]["rb-aioutliers"] = {"count" => 10, "memory" => 0 }
 
+# exclude mem services, setting memory to 0 for each.
+default['redborder']['excluded_memory_services'] = %w[chef-client]
+
 # default attributes for managers_info, it would be rewriten with the cluster config
 default["redborder"]["cluster_info"] = {}
 default["redborder"]["cluster_info"][node["hostname"]] = {}

resources/libraries/memory_services.rb

@@ -9,7 +9,9 @@ def memory_services(sysmem_total, excluded_services=[])
 
       node["redborder"]["memory_services"].each do |name,mem_s|
         if node["redborder"]["services"][name] and !excluded_services.include?(name)
-          memory_services_size = memory_services_size + mem_s["count"] 
+          if !node["redborder"]["excluded_memory_services"].include?(name)
+            memory_services_size = memory_services_size + mem_s["count"] 
+          end
         end
         memory_services_size_total = memory_services_size_total + mem_s["count"]
       end
@@ -24,17 +26,18 @@ def memory_services(sysmem_total, excluded_services=[])
       node["redborder"]["memory_services"].each do |name,mem_s|
 
         if node["redborder"]["services"][name] and !excluded_services.include?(name) 
-
-          # service count memory assigned * system memory / assigned services memory size
-          memory_serv[name] = (mem_s["count"] * sysmem_total / memory_services_size).round
-          #if the service has a limit of memory, we have to recalculate all using recursivity
-          if !mem_s["max_limit"].nil? and memory_serv[name] > mem_s["max_limit"]
-            memlimit_found = true
-            excluded_services << name
-            #assigning the limit of memory for this service
-            node.default["redborder"]["memory_services"][name]["memory"] = mem_s["max_limit"]
-            #now we have to take off the memory excluded from the total to recalculate memory wihout excluded services by limit
-            sysmem_total_limitsless = sysmem_total - mem_s["max_limit"]
+          if !node["redborder"]["excluded_memory_services"].include?(name)
+            # service count memory assigned * system memory / assigned services memory size
+            memory_serv[name] = (mem_s["count"] * sysmem_total / memory_services_size).round
+            #if the service has a limit of memory, we have to recalculate all using recursivity
+            if !mem_s["max_limit"].nil? and memory_serv[name] > mem_s["max_limit"]
+              memlimit_found = true
+              excluded_services << name
+              #assigning the limit of memory for this service
+              node.default["redborder"]["memory_services"][name]["memory"] = mem_s["max_limit"]
+              #now we have to take off the memory excluded from the total to recalculate memory wihout excluded services by limit
+              sysmem_total_limitsless = sysmem_total - mem_s["max_limit"]
+            end
           end
         end
       end

resources/metadata.rb

@@ -4,7 +4,7 @@
 license          'All rights reserved'
 description      'Installs/Configures redborder manager'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '1.7.8'
+version          '1.7.9'
 
 depends 'chef-server'
 depends 'zookeeper'

resources/recipes/prepare_system.rb

@@ -132,7 +132,6 @@
 #node attributes related with memory are changed inside the function to have simplicity using recursivity
 memory_services(sysmem_total)
 
-
 #License
 
 modules = ["ips", "flow", "monitor", "location", "api", "malware", "vault"]