modules/mu/groomers/chef.rb in cloud-mu-3.0.0beta vs modules/mu/groomers/chef.rb in cloud-mu-3.0.0

@@ -259,10 +259,14 @@
         if !@config['application_attributes'].nil?
           MU.log "Setting node:#{@server.mu_name} application_attributes", MU::DEBUG, details: @config['application_attributes']
           chef_node.normal['application_attributes'] = @config['application_attributes']
           chef_node.save
         end
+        if !@config['groomer_variables'].nil?
+          chef_node.normal['mu'] = @config['groomer_variables']
+          chef_node.save
+        end
         if @server.deploy.original_config.has_key?('parameters')
           MU.log "Setting node:#{@server.mu_name} parameters", MU::DEBUG, details: @server.deploy.original_config['parameters']
           chef_node.normal['mu_parameters'] = @server.deploy.original_config['parameters']
           chef_node.save
         end
@@ -459,10 +463,10 @@
           end
           guardfile = "/opt/mu_installed_chef"
 
           retries = 0
           begin
-            ssh = @server.getSSHSession(15)
+            ssh = @server.getSSHSession(25)
             Timeout::timeout(60) {
               if leave_ours
                 MU.log "Expunging pre-existing Chef install on #{@server.mu_name}, if we didn't create it", MU::NOTICE
                 begin 
                   ssh.exec!(%Q{test -f #{guardfile} || (#{remove_cmd}) ; touch #{guardfile}})