Merge pull request #253 from redBorder/development

Release 4.6.0

CHANGELOG.md

@@ -1,6 +1,11 @@
 cookbook-rb-manager CHANGELOG
 ===============
 
+## 4.6.0
+
+  - David Vanhoucke
+    - [b4abc7a] execute add_mcli before installing and registering minio
+
 ## 4.5.0
 
   - Miguel Negrón

resources/metadata.rb

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

resources/recipes/configure.rb

@@ -614,12 +614,10 @@
 
 s3_secrets = {}
 
-if manager_services['s3'] && (external_services['s3'] == 'onpremise')
-  begin
-    s3_secrets = data_bag_item('passwords', 's3')
-  rescue
-    s3_secrets = {}
-  end
+begin
+  s3_secrets = data_bag_item('passwords', 's3')
+rescue
+  s3_secrets = {}
 end
 
 # Allow only s3 onpremise nodes for now..
@@ -629,9 +627,9 @@
   secret_key_id s3_secrets['s3_secret_key_id']
   if manager_services['s3'] && (external_services['s3'] == 'onpremise')
     ipaddress node['ipaddress_sync']
-    action [:add, :register, :add_mcli]
+    action [:add_mcli, :add, :register]
   else
-    action [:remove, :deregister, :add_mcli]
+    action [:add_mcli, :remove, :deregister]
   end
 end