cheftacular 2.10.2 → 2.11.0

data/lib/cheftacular/stateless_actions/update_thecheftacularcookbook.rb

@@ -30,7 +30,7 @@ class Cheftacular
 
         `rm -Rf #{ @config['locs']['cookbooks'] }/TheCheftacularCookbook` if File.exists?(File.expand_path("#{ @config['locs']['cookbooks'] }/TheCheftacularCookbook"))
         `cp -Rf #{ @config['locs']['berks'] }/#{ cheftacular_cookbook['location'] } #{ @config['locs']['cookbooks'] }/TheCheftacularCookbook`
-
+        
         break
       end
     end

data/lib/cheftacular/stateless_actions/upload_nodes.rb

@@ -27,7 +27,7 @@ class Cheftacular
   end
 
   class StatelessAction
-    def upload_nodes invalidate_file_node_cache=false
+    def upload_nodes invalidate_file_node_cache=true
       @config['filesystem'].cleanup_file_caches('current-nodes') if invalidate_file_node_cache
 
       raise "This action can only be performed if the mode is set to devops" if !@config['helper'].running_in_mode?('devops') && !@options['in_scaling']
@@ -38,7 +38,7 @@ class Cheftacular
         @config['initializer'].initialize_node_roles_bag_contents env
       end
 
-      nodes = @options['multi-step'] ? @config['getter'].get_true_node_objects(true,true) : @config['getter'].get_true_node_objects(true)
+      nodes = @options['multi-step'] ? @config['getter'].get_true_node_objects(true) : @config['getter'].get_true_node_objects(true)
 
       node_roles_hash, bag_hash, allowed_changes_hash = {},{},{}
 

data/lib/cheftacular/version.rb

@@ -1,5 +1,5 @@
 class Cheftacular
   #major_version.minor_version.bugfixes
-  VERSION      = "2.10.2"
+  VERSION      = "2.11.0"
   RUBY_VERSION = "2.2.2"
 end

data/lib/cloud_interactor/domain/create.rb

@@ -4,14 +4,14 @@ class CloudInteractor
       read args, false
 
       unless @main_obj["specific_#{ IDENTITY }"].empty?
-        puts "#{ IDENTITY } #{ args[IDENTITY.singularize] } already exists... returning."
+        puts "(#{ IDENTITY.capitalize }) #{ IDENTITY } #{ args[IDENTITY.singularize] } already exists... returning."
 
         return false
       end
 
       @classes['auth'].auth_service(RESOURCE).instance_eval('zones').create(domain: args[IDENTITY.singularize], email: @auth_hash['cloud_authentication'][@options['preferred_cloud']]['email'])
 
-      puts "Created #{ IDENTITY } #{ args[IDENTITY.singularize] }..."
+      puts "(#{ IDENTITY.capitalize }) Created #{ IDENTITY } #{ args[IDENTITY.singularize] }..."
     end
   end
 end

data/lib/cloud_interactor/domain/create_record.rb

@@ -22,7 +22,7 @@ class CloudInteractor
 
         specific_fog_object.records.create(name: args['target_domain'], value: args['target_ip'], type: args['type'], ttl: args['ttl'])
 
-        puts "Attached #{ args['subdomain'] } (#{ args['target_ip'] }) to #{ args[IDENTITY.singularize] } (#{ args['target_domain'] })..."
+        puts "(#{ IDENTITY.capitalize }) Attached #{ args['subdomain'] } (#{ args['target_ip'] }) to #{ args[IDENTITY.singularize] } (#{ args['target_domain'] })..."
       end
     end
   end

data/lib/cloud_interactor/domain/destroy.rb

@@ -4,14 +4,14 @@ class CloudInteractor
       read args, false
 
       if @main_obj["specific_#{ IDENTITY }"].empty? && @main_obj["specific_#{ IDENTITY }"].last[IDENTITY.singularize] != args[IDENTITY.singularize]
-        puts "#{ IDENTITY } #{ args[IDENTITY.singularize] } doesn't exist... returning."
+        puts "(#{ IDENTITY.capitalize }) #{ IDENTITY } #{ args[IDENTITY.singularize] } doesn't exist... returning."
 
         return false
       end
 
       @classes['auth'].auth_service(RESOURCE).instance_eval('zones').get(@main_obj["specific_#{ IDENTITY }"].last['id']).destroy
 
-      puts "Destroyed #{ IDENTITY.singularize } #{ args[IDENTITY.singularize] }..."
+      puts "(#{ IDENTITY.capitalize }) Destroyed #{ IDENTITY.singularize } #{ args[IDENTITY.singularize] }..."
     end
   end
 end

data/lib/cloud_interactor/domain/destroy_record.rb

@@ -13,7 +13,7 @@ class CloudInteractor
 
       raise "Subdomain not found for #{ args[IDENTITY.singularize] }" unless already_exists
 
-      puts "Destroying #{ args['subdomain'] } from #{ args[IDENTITY.singularize] }..."
+      puts "(#{ IDENTITY.capitalize }) Destroying #{ args['subdomain'] } from #{ args[IDENTITY.singularize] }..."
 
       specific_fog_object = @classes['auth'].auth_service(RESOURCE).instance_eval('zones').get @main_obj["specific_#{ IDENTITY }"].last['id']
 

data/lib/cloud_interactor/domain/list_records.rb

@@ -1,7 +1,7 @@
 class CloudInteractor
   class Domain
     def list_records args, output=false
-      puts "Querying #{ args["domain"] } for records..."
+      puts "(#{ IDENTITY.capitalize }) Querying #{ args["domain"] } for records..."
 
       specific_fog_object = @classes['auth'].auth_service(RESOURCE).instance_eval('zones').get @main_obj["specific_#{ IDENTITY }"].last['id']
 

data/lib/cloud_interactor/domain/read.rb

@@ -17,7 +17,7 @@ class CloudInteractor
 
       ap(@main_obj["specific_#{ IDENTITY }"]) if output
 
-      puts("#{ specific_identity } not found in #{ IDENTITY }!") if @main_obj["specific_#{ IDENTITY }"].empty?
+      puts("(#{ IDENTITY.capitalize }) #{ specific_identity } not found in #{ IDENTITY }!") if @main_obj["specific_#{ IDENTITY }"].empty?
     end
   end
 end

data/lib/cloud_interactor/domain/read_record.rb

@@ -21,7 +21,7 @@ class CloudInteractor
         ap(record_hash) if output
       end
 
-      puts("#{ args[IDENTITY.singularize] } does not have the subdomain #{ args['subdomain'] }!") if @main_obj["specific_queried_domains"].nil?
+      puts("(#{ IDENTITY.capitalize }) #{ args[IDENTITY.singularize] } does not have the subdomain #{ args['subdomain'] }!") if @main_obj["specific_queried_domains"].nil?
     end
   end
 end

data/lib/cloud_interactor/domain/update.rb

@@ -5,14 +5,14 @@ class CloudInteractor
       read args, false
 
       if (@main_obj["specific_#{ IDENTITY }"].nil? || @main_obj["specific_#{ IDENTITY }"].empty?) && @main_obj["specific_#{ IDENTITY }"].last[IDENTITY.singularize] != args[IDENTITY.singularize]
-        puts "#{ IDENTITY } #{ args[IDENTITY.singularize] } doesn't exist... returning."
+        puts "(#{ IDENTITY.capitalize }) #{ IDENTITY } #{ args[IDENTITY.singularize] } doesn't exist... returning."
 
         return false
       end
 
       @classes['auth'].auth_service(resource).instance_eval('zones').get(@main_obj["specific_#{ IDENTITY }"].last['id']).update(ttl: 5, email: @auth_hash['cloud_authentication'][@options['preferred_cloud']]['email'])
 
-      puts "Updated #{ IDENTITY } #{ args[IDENTITY.singularize] }..."
+      puts "(#{ IDENTITY.capitalize }) Updated #{ IDENTITY } #{ args[IDENTITY.singularize] }..."
     end
   end
 end

data/lib/cloud_interactor/domain/update_record.rb

@@ -8,7 +8,7 @@ class CloudInteractor
 
       read args, false
 
-      puts "Updating #{ args['subdomain'] } for #{ args[IDENTITY.singularize] }..."
+      puts "(#{ IDENTITY.capitalize }) Updating #{ args['subdomain'] } for #{ args[IDENTITY.singularize] }..."
 
       @main_obj['specific_records'][args[IDENTITY.singularize]].each do |record_hash|
         already_created = true if record_hash['name'] == args['target_domain'] && record_hash['type'] == args['type']
@@ -35,7 +35,7 @@ class CloudInteractor
           raise "Unsupported action #{ __method__ } for #{ @options['preferred_cloud'] }. Please create an issue on github or submit a PR to fix this issue."
         end
 
-        puts "Updated #{ args['subdomain'] } (#{ args['target_ip'] }) to #{ args[IDENTITY.singularize] } (#{ args['target_domain'] })..."
+        puts "(#{ IDENTITY.capitalize }) Updated #{ args['subdomain'] } (#{ args['target_ip'] }) to #{ args[IDENTITY.singularize] } (#{ args['target_domain'] })..."
       else
         create_record [ args ]
       end

data/lib/cloud_interactor/helpers.rb

@@ -14,7 +14,7 @@ class CloudInteractor
     end
 
     def generic_list_call identity, resource, output=true
-      puts "Returning list of #{ identity } for #{ resource == 'DNS' ? @options['route_dns_changes_via'] : @options['preferred_cloud'] }..."
+      puts "(#{ identity.capitalize }) Returning list of #{ identity } for #{ resource == 'DNS' ? @options['route_dns_changes_via'] : @options['preferred_cloud'] }..."
 
       @main_obj[identity] = JSON.parse(@classes['auth'].auth_service(resource).instance_eval(identity).to_json)
 
@@ -30,7 +30,7 @@ class CloudInteractor
 
       @main_obj[identity].each do |identity_hash|
         if specific_identity.nil?
-          puts("Query arguments \"#{ args }\" are not being mapped correctly for #{ identity.singularize } reads from method #{ caller[3][/`.*'/][1..-2] }! This read will return no objects.")
+          puts("(#{ identity.capitalize }) Query arguments \"#{ args }\" are not being mapped correctly for #{ identity.singularize } reads from method #{ caller[3][/`.*'/][1..-2] }! This read will return no objects.")
         
           break
         end
@@ -46,19 +46,24 @@ class CloudInteractor
         ap(identity_hash) if output
       end
 
-      puts("#{ specific_identity } not found in #{ identity }!") if @main_obj["specific_#{ identity }"].empty?
+      puts("(#{ identity.capitalize }) #{ specific_identity } matched and being utilized for #{ identity }.") unless @main_obj["specific_#{ identity }"].empty?
+      puts("(#{ identity.capitalize }) #{ specific_identity } not found in #{ identity }!")                       if @main_obj["specific_#{ identity }"].empty?
     end
 
     def generic_destroy_parse destroy_hash, identity, resource, mode='name'
       puts("Queried #{ identity } #{ ap @main_obj["specific_#{ identity }"] }") if @options['verbose']
 
-      raise "#{ identity.singularize } not found for #{ destroy_hash[mode] }" unless @main_obj["specific_#{ identity }"]
+      if @main_obj["specific_#{ identity }"].empty?
+        puts "#{ destroy_hash[mode] } was not found in #{ identity.singularize } to destroy!" 
+
+        return false
+      end
 
       if destroy_hash[mode].empty? || @main_obj["specific_#{ identity }"].last[mode] != destroy_hash[mode] #without this it will delete the first object in the list, this is obviously bad
         raise "Name mismatch on destroy! Expected #{ destroy_hash[mode] } and was going to destroy #{ @main_obj["specific_#{ identity }"].last[mode] }"
       end
 
-      puts "Destroying #{ destroy_hash[mode] }..."
+      puts "(#{ identity.capitalize }) Destroying #{ destroy_hash[mode] }..."
 
       specific_fog_object = @classes['auth'].auth_service(resource).instance_eval(identity).get @main_obj["specific_#{ identity }"].last['id']
 
@@ -68,7 +73,7 @@ class CloudInteractor
         @main_obj["#{ identity }_destroy_request"] = specific_fog_object.destroy
       end
 
-      puts "REMINDER! This destroy is not instant! It can take up to a few minutes for a #{ identity.singularize } to actually be fully destroyed!"
+      puts "(#{ identity.capitalize }) REMINDER! This destroy is not instant! It can take up to a few minutes for a #{ identity.singularize } to actually be fully destroyed!"
     end
   end
 end

data/lib/cloud_interactor/server/attach_volume.rb

@@ -17,7 +17,7 @@ class CloudInteractor
         @classes['volume'].read args
       end
 
-      puts "Attaching #{ args['volume_name'] } to #{ args['server_name'] } in #{ IDENTITY }..."
+      puts "(#{ IDENTITY }) Attaching #{ args['volume_name'] } to #{ args['server_name'] } in #{ IDENTITY }..."
 
       read args, false, 'name', 'server_name'
 

data/lib/cloud_interactor/server/create.rb

@@ -5,7 +5,7 @@ class CloudInteractor
       @classes['image'].read @options['preferred_cloud_image'], false
 
       #Note, if no flavor is passed it defaults to a 512MB standard!
-      @classes['flavor'].read args['flavor']
+      @classes['flavor'].read args['flavor'], @options.has_key?('verbose')
 
       @classes['region'].read(@options['preferred_cloud_region'], false) if @options['preferred_cloud'] == 'digitalocean'
       @classes['sshkey'].bootstrap if @options['preferred_cloud'] == 'digitalocean'
@@ -13,12 +13,12 @@ class CloudInteractor
       read args, false
 
       unless @main_obj["specific_#{ IDENTITY }"].empty?
-        puts "#{ IDENTITY } #{ args['name'] } already exists... returning."
+        puts "(#{ IDENTITY }) #{ IDENTITY } #{ args['name'] } already exists... returning."
 
         return false
       end
 
-      puts "Creating #{ args['name'] } in #{ IDENTITY }..."
+      puts "(#{ IDENTITY }) Creating #{ args['name'] } in #{ IDENTITY }..."
 
       final_create_args = {
         name:      args['name'],
@@ -45,7 +45,7 @@ class CloudInteractor
       @main_obj["#{ IDENTITY }_created_details"] ||= {}
       @main_obj["#{ IDENTITY }_created_details"][args['name']] = @main_obj["#{ IDENTITY }_create_request"]
 
-      puts "Successfully created #{ args['name'] } with pass #{ @main_obj["#{ IDENTITY }_created_passwords"][args['name']] }"
+      puts "(#{ IDENTITY }) Successfully created #{ args['name'] } with pass #{ @main_obj["#{ IDENTITY }_created_passwords"][args['name']] }"
 
       @main_obj['output']['admin_passwords'] = { args['name'] => @main_obj["#{ IDENTITY }_created_passwords"][args['name']] }
     end

data/lib/cloud_interactor/server/detach_volume.rb

@@ -5,7 +5,7 @@ class CloudInteractor
 
       read_volume args, false, true
 
-      puts "Detaching #{ args['volume_name'] } from #{ args['server_name'] } in #{ IDENTITY }..."
+      puts "(#{ IDENTITY }) Detaching #{ args['volume_name'] } from #{ args['server_name'] } in #{ IDENTITY }..."
 
       specific_fog_object = @classes['auth'].auth_service(RESOURCE).instance_eval(IDENTITY).get @main_obj["specific_#{ IDENTITY }"].last['id']
 
@@ -15,7 +15,7 @@ class CloudInteractor
         out << attachment.detach.to_s
       end
 
-      puts "The state of the volume detachment is #{ out } for #{ args['server_name'] } in #{ IDENTITY }"
+      puts "(#{ IDENTITY }) The state of the volume detachment is #{ out } for #{ args['server_name'] } in #{ IDENTITY }"
     end
   end
 end

data/lib/cloud_interactor/server/list_volumes.rb

@@ -1,7 +1,7 @@
 class CloudInteractor
   class Server
     def list_volumes args, output=true
-      puts "Returning list of volumes for #{ args['server_name'] } in #{ IDENTITY }..."
+      puts "(#{ IDENTITY }) Returning list of volumes for #{ args['server_name'] } in #{ IDENTITY }..."
 
       read(args, false, 'name', 'server_name') if @main_obj["specific_#{ IDENTITY }"].nil?
 

data/lib/cloud_interactor/server/poll.rb

@@ -5,7 +5,7 @@ class CloudInteractor
 
       raise "Server #{ args['name'] } does not exist!" if @main_obj["specific_#{ IDENTITY }"].empty?
 
-      puts "Polling #{ args['name'] } for status...(execution will continue when the server is finished building)"
+      puts "(#{ IDENTITY.capitalize }) Polling #{ args['name'] } for status...(execution will continue when the server is finished building)"
 
       specific_fog_object = @classes['auth'].auth_service(RESOURCE).instance_eval(IDENTITY).get @main_obj["specific_#{ IDENTITY }"].last['id']
 
@@ -16,7 +16,7 @@ class CloudInteractor
 
       @main_obj['output']["created_servers"] << JSON.parse(specific_fog_object.reload.to_json)
 
-      puts "#{ args['name'] } became active in #{ duration_hash[:duration] } seconds!"
+      puts "(#{ IDENTITY.capitalize }) #{ args['name'] } became active in #{ duration_hash[:duration] } seconds!"
     end
   end
 end

data/lib/cloud_interactor/server/read_volume.rb

@@ -18,7 +18,7 @@ class CloudInteractor
         ap(volume_hash) if output
       end
 
-      puts("#{ specific_volume } not attached to #{ args['server_name'] }!") if @main_obj["specific_attached_volumes"].nil?
+      puts("(#{ IDENTITY }) #{ specific_volume } not attached to #{ args['server_name'] }!") if @main_obj["specific_attached_volumes"].nil?
     end
   end
 end

data/lib/cloud_interactor/version.rb

@@ -1,4 +1,4 @@
 class CloudInteractor
   #major_version.minor_version.bugfixes
-  VERSION      = "1.0.0"
+  VERSION      = "1.1.0"
 end

data/lib/cloud_interactor/volume/create.rb

@@ -1,7 +1,7 @@
 class CloudInteractor
   class Volume
     def create args
-      puts "Creating #{ args['display_name'] } in #{ IDENTITY }..."
+      puts "(#{ IDENTITY }) Creating #{ args['display_name'] } in #{ IDENTITY }..."
 
       puts("Creating #{ IDENTITY.singularize } with args #{ ap(args) }") if @options['verbose']
 

data/lib/sshkit/getters.rb

@@ -23,7 +23,7 @@ module SSHKit
         raise "Unknown repository or rolename for #{ name }"
       end
 
-      def get_node_from_address nodes, address, ret_node = nil
+      def get_node_from_address nodes, address, ret_node=nil
         nodes.each do |n|
           if n.public_ipaddress == address
             ret_node = n
@@ -64,6 +64,14 @@ module SSHKit
 
         ret
       end
+
+      def get_server_hash_from_address array_of_server_hashes, address, ret_hash=nil
+        array_of_server_hashes.each do |server_hash|
+          ret_hash = server_hash if server_hash['address'] == address
+        end
+
+        ret_hash
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheftacular
 version: !ruby/object:Gem::Version
-  version: 2.10.2
+  version: 2.11.0
 platform: ruby
 authors:
 - Louis Alridge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '11.12'
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: ridley
   requirement: !ruby/object:Gem::Requirement
@@ -253,14 +267,14 @@ files:
 - lib/cheftacular/stateless_actions/add_ssh_key_to_bag.rb
 - lib/cheftacular/stateless_actions/arguments.rb
 - lib/cheftacular/stateless_actions/backups.rb
-- lib/cheftacular/stateless_actions/bootstrappers/centos_bootstrap.rb
-- lib/cheftacular/stateless_actions/bootstrappers/coreos_bootstrap.rb
-- lib/cheftacular/stateless_actions/bootstrappers/fedora_bootstrap.rb
-- lib/cheftacular/stateless_actions/bootstrappers/redhat_bootstrap.rb
-- lib/cheftacular/stateless_actions/bootstrappers/ubuntu_bootstrap.rb
-- lib/cheftacular/stateless_actions/bootstrappers/vyatta_bootstrap.rb
+- lib/cheftacular/stateless_actions/bootstrappers/centos_bootstrap_from_queue.rb
+- lib/cheftacular/stateless_actions/bootstrappers/coreos_bootstrap_from_queue.rb
+- lib/cheftacular/stateless_actions/bootstrappers/fedora_bootstrap_from_queue.rb
+- lib/cheftacular/stateless_actions/bootstrappers/redhat_bootstrap_from_queue.rb
+- lib/cheftacular/stateless_actions/bootstrappers/ubuntu_bootstrap_from_queue.rb
+- lib/cheftacular/stateless_actions/bootstrappers/vyatta_bootstrap_from_queue.rb
 - lib/cheftacular/stateless_actions/check_cheftacular_yml_keys.rb
-- lib/cheftacular/stateless_actions/chef_bootstrap.rb
+- lib/cheftacular/stateless_actions/chef_bootstrap_from_queue.rb
 - lib/cheftacular/stateless_actions/chef_server.rb
 - lib/cheftacular/stateless_actions/cheftacular_config.rb
 - lib/cheftacular/stateless_actions/cheftacular_yml_help.rb
@@ -271,6 +285,7 @@ files:
 - lib/cheftacular/stateless_actions/client_list.rb
 - lib/cheftacular/stateless_actions/cloud.rb
 - lib/cheftacular/stateless_actions/cloud_bootstrap.rb
+- lib/cheftacular/stateless_actions/cloud_bootstrap_from_queue.rb
 - lib/cheftacular/stateless_actions/compile_audit_log.rb
 - lib/cheftacular/stateless_actions/compile_readme.rb
 - lib/cheftacular/stateless_actions/create_git_key.rb
@@ -278,7 +293,7 @@ files:
 - lib/cheftacular/stateless_actions/environment.rb
 - lib/cheftacular/stateless_actions/file.rb
 - lib/cheftacular/stateless_actions/fix_known_hosts.rb
-- lib/cheftacular/stateless_actions/full_bootstrap.rb
+- lib/cheftacular/stateless_actions/full_bootstrap_from_queue.rb
 - lib/cheftacular/stateless_actions/get_active_ssh_connections.rb
 - lib/cheftacular/stateless_actions/get_haproxy_log.rb
 - lib/cheftacular/stateless_actions/get_log_from_bag.rb

data/lib/cheftacular/stateless_actions/bootstrappers/ubuntu_bootstrap.rb

@@ -1,116 +0,0 @@
-class Cheftacular
-  class StatelessActionDocumentation
-    def ubuntu_bootstrap
-      @config['documentation']['stateless_action'][__method__] ||= {}
-      @config['documentation']['stateless_action'][__method__]['long_description'] = [
-        "`cft ubuntu_bootstrap ADDRESS ROOT_PASS` This command will bring a fresh server to a state " +
-        "where chef-client can be run on it via `cft chef-bootstrap`. It should be noted that it is in "+
-        "this step where a server's randomized deploy_user sudo password is generated."
-      ]
-
-      @config['documentation']['stateless_action'][__method__]['short_description'] = 'Updates an ubuntu server to have more secure defaults'
-    end
-  end
-
-  class StatelessAction
-    def ubuntu_bootstrap out=[]
-      raise "This action can only be performed if the mode is set to devops" if !@config['helper'].running_in_mode?('devops') && !@options['in_scaling']
-
-      @options['address']     = ARGV[1] unless @options['address']
-      @options['client_pass'] = ARGV[2] unless @options['address']
-
-      if `which sshpass`.empty?
-        raise "sshpass not installed! Please run brew install https://raw.github.com/eugeneoden/homebrew/eca9de1/Library/Formula/sshpass.rb (or get it from your repo for linux)"
-      end
-
-      new_deploy_pass = @config['helper'].gen_pass(@config['cheftacular']['server_pass_length'])
-
-      deploy_user = @config['cheftacular']['deploy_user']
-
-      root_commands = [
-        "cd /home",
-        "adduser #{ deploy_user } --gecos \",,,,\" --disabled-password",
-        "echo #{ deploy_user }:#{ new_deploy_pass } | chpasswd",
-        "adduser #{ deploy_user } www-data",
-        "adduser #{ deploy_user } sudo",
-        "mkdir -p /home/#{ deploy_user }/.ssh",
-        "touch /home/#{ deploy_user }/.ssh/authorized_keys && touch /home/#{ deploy_user }/.ssh/known_hosts",
-        "chown -R #{ deploy_user }:www-data /home/#{ deploy_user }/.ssh",
-        'sed -i "s/StrictModes yes/StrictModes yes\nPasswordAuthentication no\nUseDNS no\nAllowUsers deploy postgres\n/" /etc/ssh/sshd_config'.gsub('deploy', deploy_user),
-        'sed -i "s/PermitRootLogin yes/PermitRootLogin no/" /etc/ssh/sshd_config'
-      ]
-
-      @config['default']['authentication_bag_hash']['authorized_keys'].each do |line|
-        root_commands << "echo \"#{ line }\" >> /home/#{ deploy_user }/.ssh/authorized_keys"
-      end
-
-      sudo = "echo #{ new_deploy_pass } | sudo -S"
-
-      deploy_commands = [
-        "#{ sudo } apt-get update",
-        "#{ sudo } apt-get install curl #{ @config['cheftacular']['pre_install_packages'] } -y",
-        "#{ sudo } apt-get upgrade -y"
-      ]
-
-      final_commands = []
-
-      if @config['cheftacular']['install_rvm_on_boot']
-        deploy_commands << "gpg --keyserver hkp://keys.gnupg.net --recv-keys #{ @config['cheftacular']['rvm_gpg_key'] }"
-        deploy_commands << "curl -L https://get.rvm.io | bash -s stable"
-
-        rvm_source = "source /home/deploy/.rvm/bin/rvm &&"
-
-        final_commands = [
-          "#{ rvm_source } echo '#{ new_deploy_pass }' | rvmsudo -S rvm requirements",
-          "#{ rvm_source } rvm install #{ @config['cheftacular']['ruby_version'] }",
-          "#{ rvm_source } rvm alias create default #{ @config['cheftacular']['ruby_version'] }",
-          "#{ rvm_source } rvm gemset empty --force"
-        ]
-
-        final_commands << "#{ rvm_source } rvm install 1.9.3-p327" if @config['cheftacular']['chef_version'].to_i < 12
-      end
-      
-      root_execute_string = "sshpass -p \"#{ @options['client_pass'] }\" ssh -t -oStrictHostKeyChecking=no root@#{ @options['address'] } '#{ root_commands.join(' && ') } && service ssh restart'"
-
-      while system(root_execute_string) != true
-        tries ||= 5
-        puts "Unable to complete step 1 of setup process, trying again in 60 seconds, there are #{ tries } more tries"
-        sleep 60
-        tries -= 1
-        raise "Unable to complete step 1 of setup process!" if tries <= 0
-      end
-
-      out << $?.to_s #output from the system command above
-
-      puts("Finished initial setup...stage 1 of 3 for server #{ @options['address'] }") if @options['in_scaling']
-
-      puts(out.last) unless @options['quiet'] || @options['in_scaling']
-
-      deploy_commands.each do |cmnd|
-        puts("(#{ @options['address'] }) Running #{ cmnd.gsub("#{ new_deploy_pass }", "sudo password") }") unless @options['quiet'] || @options['in_scaling']
-        
-        out << `ssh -t -oStrictHostKeyChecking=no #{ deploy_user }@#{ @options['address'] } "#{ cmnd }"`
-
-        puts(out.last) unless @options['quiet'] || @options['in_scaling']
-      end
-
-      puts("Finished deploy setup....stage 2 of 3 for server #{ @options['address'] }") if @options['in_scaling']
-
-      final_commands.each do |cmnd|
-        puts "(#{ @options['address'] }) Running #{ cmnd.gsub("#{ new_deploy_pass }", "sudo password") }"
-
-        out << `ssh -t -oStrictHostKeyChecking=no #{ deploy_user }@#{ @options['address'] } "#{ cmnd }"`
-
-        puts(out.last) unless @options['quiet'] || @options['in_scaling']
-      end
-
-      puts("Finished ruby setup......stage 3 of 3 for server #{ @options['address'] }") if @options['in_scaling']
-
-      @config[@options['env']]['server_passwords_bag_hash']["#{ @options['address'] }-root-pass"]   = @options['client_pass']
-      @config[@options['env']]['server_passwords_bag_hash']["#{ @options['address'] }-deploy-pass"] = new_deploy_pass
-      @config[@options['env']]['server_passwords_bag_hash']["#{ @options['address'] }-name"]        = @options['node_name'] if @options['node_name']
-
-      @config['ChefDataBag'].save_server_passwords_bag unless @options['in_scaling']
-    end
-  end
-end