Merge pull request #252 from redBorder/development

Release 4.5.0
redBorder · Nov 13, 2024 · 0009bd8 · 0009bd8
2 parents 575316e + ca4a276
commit 0009bd8
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,18 @@
 cookbook-rb-manager CHANGELOG
 ===============
 
+## 4.5.0
+
+  - Miguel Negrón
+    - [99f02b0] Merge pull request #226 from redBorder/bugfix/#19144_missing_nginx_confd_files
+    - [917b21b] Merge branch 'development' into bugfix/#19144_missing_nginx_confd_files
+  - David Vanhoucke
+    - [a5e7fda] remove files if service disabled
+    - [06dc4b6] Merge remote-tracking branch 'origin/development' into bugfix/#19144_missing_nginx_confd_files
+  - Miguel Negron
+    - [617db93] Add outliers
+    - [967cdc1] Calling add nginx conf
+
 ## 4.4.7
 
   - Rafael Gomez

diff --git a/resources/metadata.rb b/resources/metadata.rb
@@ -5,7 +5,7 @@
 maintainer_email '[email protected]'
 license          'AGPL-3.0'
 description      'Installs/Configures redborder manager'
-version          '4.4.7'
+version          '4.5.0'
 
 depends 'rb-common'
 depends 'chef-server'

diff --git a/resources/recipes/configure.rb b/resources/recipes/configure.rb
@@ -298,20 +298,22 @@
 end
 
 nginx_config 'Configure Nginx Chef' do
-  if manager_services['nginx'] && manager_services['chef-server']
+  if manager_services['nginx'] && node['redborder']['erchef']['hosts'] && !node['redborder']['erchef']['hosts'].empty?
+    erchef_hosts node['redborder']['erchef']['hosts']
     service_name 'erchef'
-    cdomain node['redborder']['cdomain']
     action [:configure_certs, :add_erchef]
   else
     action :nothing
   end
 end
 
 nginx_config 'Configure Nginx aioutliers' do
-  if manager_services['nginx'] && manager_services['rb-aioutliers']
+  if manager_services['nginx'] && node['redborder']['rb-aioutliers']['hosts'] && !node['redborder']['rb-aioutliers']['hosts'].empty?
+    aioutliers_hosts node['redborder']['rb-aioutliers']['hosts']
     service_name 'rb-aioutliers'
-    cdomain node['redborder']['cdomain']
     action [:configure_certs, :add_aioutliers]
+  elsif manager_services['nginx']
+    action :remove_aioutliers
   else
     action :nothing
   end
@@ -333,7 +335,7 @@
 end
 
 webui_config 'Configure Nginx WebUI' do
-  if manager_services['webui'] && manager_services['nginx']
+  if manager_services['nginx'] && node['redborder']['webui']['hosts'] && !node['redborder']['webui']['hosts'].empty?
     hosts node['redborder']['webui']['hosts']
     cdomain node['redborder']['cdomain']
     port node['redborder']['webui']['port']
@@ -361,11 +363,14 @@
   end
 end
 
-http2k_config 'Configure Nginx Http2k' do
-  if manager_services['http2k'] && manager_services['nginx']
-    domain node['redborder']['cdomain']
-    port node['redborder']['http2k']['port']
-    action [:configure_certs, :add_http2k_conf_nginx]
+nginx_config 'Configure Nginx Http2k' do
+  if manager_services['nginx'] && node['redborder']['http2k']['hosts'] && !node['redborder']['http2k']['hosts'].empty?
+    http2k_hosts node['redborder']['http2k']['hosts']
+    http2k_port node['redborder']['http2k']['port']
+    service_name 'http2k'
+    action [:configure_certs, :add_http2k]
+  elsif manager_services['nginx']
+    action :remove_http2k
   else
     action :nothing
   end

diff --git a/resources/recipes/prepare_system.rb b/resources/recipes/prepare_system.rb
@@ -151,6 +151,15 @@
 node.default['redborder']['webui']['hosts'] = webui_hosts
 node.run_state['auth_token'] = get_api_auth_token if File.exist?('/etc/redborder/cluster-installed.txt')
 
+erchef_hosts = node['redborder']['managers_per_services']['chef-server'].map { |z| "#{z}.#{node['redborder']['cdomain']}" if node['redborder']['cdomain'] }
+node.default['redborder']['erchef']['hosts'] = erchef_hosts
+
+http2k_hosts = node['redborder']['managers_per_services']['http2k'].map { |z| "#{z}.#{node['redborder']['cdomain']}" if node['redborder']['cdomain'] }
+node.default['redborder']['http2k']['hosts'] = http2k_hosts
+
+rb_aioutliers_hosts = node['redborder']['managers_per_services']['rb-aioutliers'].map { |z| "#{z}.#{node['redborder']['cdomain']}" if node['redborder']['cdomain'] }
+node.default['redborder']['rb-aioutliers']['hosts'] = rb_aioutliers_hosts
+
 # set kafka host index if kafka is enabled in this host
 if node['redborder']['managers_per_services']['kafka'].include?(node.name)
   node.default['redborder']['kafka']['host_index'] = node['redborder']['managers_per_services']['kafka'].index(node.name)