Merge branch 'master' into feature/#18850_add_internal_virtual_ips

redBorder · Jan 20, 2025 · 936b631 · 936b631
2 parents e1ae784 + ac6c6d2
commit 936b631
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,16 @@
 cookbook-rb-manager CHANGELOG
 ===============
 
+## 4.7.4
+
+  - nilsver
+    - [78005ed] add more checks2
+
+## 4.7.3
+
+  - Miguel Negrón
+    - [46efa0c] dont pass s3_hostname con configure_certs && add_aioutliers
+
 ## 4.7.2
 
   - David Vanhoucke

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.7.2'
+version          '4.7.4'
 
 depends 'rb-common'
 depends 'chef-server'

diff --git a/resources/recipes/configure.rb b/resources/recipes/configure.rb
@@ -346,7 +346,6 @@
   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'
-    s3_hostname "#{s3_secrets['s3_host']}:9000"
     action [:configure_certs, :add_aioutliers]
   elsif manager_services['nginx']
     action :remove_aioutliers

diff --git a/resources/recipes/prepare_system.rb b/resources/recipes/prepare_system.rb
@@ -89,7 +89,7 @@
   elasticache = {}
 end
 
-if !elasticache.empty?
+if !elasticache.empty? && !elasticache['cfg_address'].nil? && !elasticache['cfg_address'].empty? && !elasticache['cfg_port'].nil? && !elasticache['cfg_port'].empty?
   node.default['redborder']['memcached']['server_list'] = getElasticacheNodes(elasticache['cfg_address'], elasticache['cfg_port'])
   node.default['redborder']['memcached']['port'] = elasticache['cfg_port']
   node.default['redborder']['memcached']['hosts'] = joinHostArray2port(node['redborder']['memcached']['server_list'], node['redborder']['memcached']['port']).join(',')