Merge branch 'development' into bugfix/#16981_fixing_wakeup_call

CHANGELOG.md

@@ -1,9 +1,16 @@
 cookbook-rb-manager CHANGELOG
 ===============
 
+## 1.9.0
+
+  - Miguel Negrón
+    - [ef94e3c] Add configure common cookbook call (#140)
+
 ## 1.8.0
+  - David Vanhoucke
+    - [c2df76a] add postfix service
   - Luis Blanco
-    - [48c4142] add the service in redborder full installation
+    - [48c4142] add ale service in redborder full installation
 
 ## 1.7.10
 

resources/attributes/default.rb

@@ -109,12 +109,12 @@
 default["redborder"]["memory_assigned"] = {}
 
 # geoip has been removed because is not a service
-default["redborder"]["services_group"]["full"] = %w[
-  consul chef-server zookeeper memcached rsyslog kafka logstash s3
-  redborder-ale postgresql redborder-postgresql nginx webui druid-broker
-  druid-historical druid-realtime druid-coordinator f2k redborder-monitor
-  pmacct redborder-dswatcher redborder-events-counter http2k
-  ]
+default["redborder"]["services_group"]["full"] = %w[consul chef-server zookeeper memcached rsyslog kafka logstash s3
+                                                    postgresql redborder-postgresql nginx webui druid-broker
+                                                    druid-historical druid-realtime druid-coordinator f2k
+                                                    redborder-monitor pmacct redborder-dswatcher
+                                                    redborder-events-counter http2k
+                                                    ]
 
 default["redborder"]["services_group"]["custom"] = []
 default["redborder"]["services_group"]["core"] = %w[consul zookeeper druid-coordinator druid-overlord hadoop-resourcemanager] #consul server
@@ -173,6 +173,7 @@
 default["redborder"]["services"]["redborder-ale"]             = false
 default["redborder"]["services"]["n2klocd"]                   = false
 default["redborder"]["services"]["radiusd"]                   = false
+default["redborder"]["services"]["postfix"]                   = true
 
 default["redborder"]["systemdservices"]["chef-client"]            = ["chef-client"]
 default["redborder"]["systemdservices"]["chef-server"]            = ["opscode-erchef"]
@@ -209,6 +210,7 @@
 default["redborder"]["systemdservices"]["redborder-ale"]          = ["redborder-ale"]
 default["redborder"]["systemdservices"]["n2klocd"]                = ["n2klocd"]
 default["redborder"]["systemdservices"]["radiusd"]                = ["radiusd"]
+default["redborder"]["systemdservices"]["postfix"]                = ["postfix"]
 
 # Tier
 default["redborder"]["druid"]["historical"]["tier"]     = "default"

resources/metadata.rb

@@ -1,11 +1,11 @@
-name            'rb-manager'
-maintainer      'Miguel Negrón'
-maintainer_email 'manegron@redborder.com'
-license          'All rights reserved'
+name             'rb-manager'
+maintainer       'Eneo Tecnología S.L.'
+maintainer_email 'git@redborder.com'
+license          'AGPL-3.0'
 description      'Installs/Configures redborder manager'
-long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '1.8.0'
+version          '1.9.0'
 
+depends 'rb-common'
 depends 'chef-server'
 depends 'zookeeper'
 depends 'kafka'
@@ -36,9 +36,9 @@
 depends 'freeradius'
 depends 'rbcep'
 depends 'cron'
-#depends 'ohai'
 depends 'rb-selinux'
 depends 'rbaioutliers'
 depends 'rbcgroup'
 depends 'rblogstatter'
 depends 'rb-arubacentral'
+depends 'rb-postfix'

resources/recipes/configure.rb

@@ -12,6 +12,10 @@
 # manager services
 manager_services = manager_services()
 
+rb_common_config "Configure common" do
+  action :configure
+end
+
 rb_selinux_config "Configure Selinux" do
   if shell_out("getenforce").stdout.chomp == "Disabled"
     action :remove
@@ -355,6 +359,10 @@
   action (node["redborder"]["services"]["redborder-cep"] ? [:add, :register] : [:remove, :deregister])
 end
 
+rb_postfix_config "Configure postfix" do
+  action (node["redborder"]["services"]["postfix"] ? :add : :remove)
+end
+
 rbcgroup_config "Configure cgroups" do
   action :add
 end

resources/templates/default/motd.erb

@@ -3,7 +3,7 @@
   Welcome to '<%= node["redborder"]["manager"]["cluster_name"] %>' redborder cluster:
 <% else %>
   Welcome to redborder-ng Manager [<%= node["hostname"] %>.<%= node["redborder"]["cdomain"] %>] (<%= node['platform'] %> - <%= node['platform_version'] %>):
-  Kernel: <%= node['os_version'].gsub("el9", "") %>
+  Kernel: <%= node['os_version'] %>
 <% end %>
 
 <% if !node["redborder"].nil? and !node["redborder"]["rpms"].nil? %>