Merge pull request #67 from martinb3/master

Disable backups when cloud credentials missing

Author: jujugrrr

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 3.1.4
+
+- Don't just raise an error, actually disable backups when cloud account credentials aren't present
+
 # 3.1.3
 
 - Clean up attributes so they don't error out when no cloud account is found

metadata.rb

@@ -5,7 +5,7 @@
 license          'Apache 2.0'
 description      'Installs/Configures elkstack'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '3.1.3'
+version          '3.1.4'
 
 depends 'apt'
 depends 'yum'

recipes/elasticsearch.rb

@@ -31,8 +31,13 @@
   action :start
 end
 
-should_backup = node.deep_fetch('elkstack', 'config', 'backups', 'enabled')
-if !should_backup.nil? && should_backup
+# was the module enabled? (default value for this ensures cloud credentials are set too)
+rackspace_elasticsearch_mod_enabled = node.deep_fetch('elasticsearch', 'custom_config', 'rackspace.enabled')
+
+# were backups turned on? they are by default, but check
+backups_enabled_flag = node.deep_fetch('elkstack', 'config', 'backups', 'enabled')
+
+if rackspace_elasticsearch_mod_enabled && backups_enabled_flag
   include_recipe 'elkstack::elasticsearch_backup'
 end