Merge branch 'master' into feature/#18850_add_internal_virtual_ips

CHANGELOG.md

@@ -1,6 +1,11 @@
 cookbook-rb-manager CHANGELOG
 ===============
 
+## 4.6.4
+
+  - Miguel Alvarez
+    - [e461f49] Always create s3cfg_initial
+
 ## 4.6.3
 
   - Nils

resources/metadata.rb

@@ -5,7 +5,7 @@
 maintainer_email '[email protected]'
 license          'AGPL-3.0'
 description      'Installs/Configures redborder manager'
-version          '4.6.3'
+version          '4.6.4'
 
 depends 'rb-common'
 depends 'chef-server'

resources/recipes/configure.rb

@@ -85,7 +85,7 @@
 
 if manager_services['keepalived']
   begin
-    vrrp_secrets = Chef::EncryptedDataBagItem.load('passwords', 'vrrp').to_hash
+    vrrp_secrets = data_bag_item('passwords', 'vrrp').to_hash
   rescue
     vrrp_secrets = {}
   end
@@ -630,6 +630,21 @@
   s3_secrets = {}
 end
 
+template '/root/.s3cfg_initial' do
+  source 's3cfg_initial.erb'
+  cookbook 'minio'
+  variables(
+    s3_user: s3_secrets['s3_access_key_id'],
+    s3_password: s3_secrets['s3_secret_key_id'],
+    s3_endpoint: 's3.service'
+  )
+  action :create
+  only_if do
+    s3_secrets['s3_access_key_id'] && !s3_secrets['s3_access_key_id'].empty? &&
+      s3_secrets['s3_secret_key_id'] && !s3_secrets['s3_secret_key_id'].empty?
+  end
+end
+
 # Allow only s3 onpremise nodes for now..
 minio_config 'Configure S3 (minio)' do
   managers_with_minio node['redborder']['managers_per_services']['s3']