fix warning for 'backup_client'

bflad · Sep 29, 2015 · ac8f105 · ac8f105
1 parent a096dcd
commit ac8f105
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -154,8 +154,6 @@
 default['stash']['backup']['cron']['weekday'] = '*'
 
 default['stash']['backup_client']['install_path'] = node['stash']['install_path']
-default['stash']['backup_client']['password']     = 'changeit'
-default['stash']['backup_client']['user']         = 'admin'
 default['stash']['backup_client']['version']      = '2.0.0'
 stash_backup_client_version = Chef::Version.new(node['stash']['backup_client']['version'])
 

diff --git a/libraries/stash.rb b/libraries/stash.rb
@@ -47,15 +47,17 @@ def self.default_database_port(type)
 
       def self.check_for_old_attributes!(node)
         backup_attrs = %w(backup_path baseurl password user cron)
+        show_warn = false
         backup_attrs.each do |attr|
           unless node['stash']['backup_client'][attr].nil?
-            node.default['stash']['backup_client'][attr] = node['stash']['backup'][attr]
+            node.default['stash']['backup'][attr] = node['stash']['backup_client'][attr]
             Chef::Log.warn "node['stash']['backup_client']['#{attr}'] has been changed to node['stash']['backup']['#{attr}']"
+            show_warn = true
           end
         end
-        Chef::Log.warn <<-EOH
+        Chef::Log.warn <<-EOH if show_warn
 This renaming introduces the common approach for both of backup strategies:
-'backup_client' and 'backup_diy'. Attributes metioned above will be gracefully
+'backup_client' and 'backup_diy'. Attributes mentioned above will be gracefully
 converted for you, but this warning and conversion will be removed in the next
 major release of the 'stash' cookbook.
 EOH