ssp 0.2 → 0.3

data/lib/ssp/application/chef.rb

@@ -0,0 +1,55 @@
+require 'chef/config'
+require 'chef/search/query'
+require 'chef/node'
+
+class SSP::App::Chef < Thor
+  namespace :chef
+
+  class_option :chef_config, :aliases => "-c",
+               :desc => "Location of the knife configuration file",
+               :default => File.join(ENV['HOME'], '.chef', 'knife.rb')
+
+
+  desc "client [NODES...]", "Runs chef-client on multiple nodes"
+  method_option :ssh_user, :aliases => "-u",
+                :desc => "The ssh username",
+                :default => "root"
+  method_option :ssh_password, :aliases => "-p",
+                :desc => "The ssh password"
+  def client(*nodes)
+    chef_config
+    command = options[:ssh_user] == "root" ? "chef-client" : "sudo chef-client"
+    ssh_run nodes.join(" "), command
+  end
+
+  private
+    def ssh_run(host, command, user = options[:ssh_user], pass = options[:ssh_password], manual = !host.index(':'))
+      ssh = ::Chef::Knife::Ssh.new
+      ssh.name_args = [ host, command ]
+      ssh.config[:ssh_user] = user
+      ssh.config[:password] = pass
+      ssh.config[:manual] = manual
+
+      begin
+        ssh.run
+      rescue Net::SSH::AuthenticationFailed
+        unless pass
+          puts "Failed to authenticate #{user} - trying password auth"
+          ssh = ::Chef::Knife::Ssh.new
+          ssh.name_args = [ host, command ]
+          ssh.config[:ssh_user] = user
+          ssh.config[:manual] = manual
+          ssh.config[:password] = ssh.get_password
+          ssh.run
+        end
+      end
+    end
+
+    def chef_config
+      unless defined?(@_chef_config_loaded)
+        ::Chef::Config.from_file(options[:chef_config])
+        @_chef_config_loaded = true
+      end
+      ::Chef::Config
+    end
+end

data/lib/ssp/application/node.rb

@@ -44,8 +44,8 @@ echo "$IP	#{fqdn} #{fqdn.split(".").first}" >> /etc/hosts
     EOH
     if chef_config[:chef_server_url] == "https://chef-server.rackspace"
       chef_server_ip = %x{dscl . read Hosts/chef-server.rackspace 2>/dev/null}[/[\d\.]+/]
-      setup_node_script << %{echo "#{chef_server_ip}	chef.secretsaucepartners.com" >> /etc/hosts\n}
-      chef_config[:chef_server_url] = "https://chef.secretsaucepartners.com"
+      setup_node_script << %{echo "#{chef_server_ip}	chef.sspti.me" >> /etc/hosts\n}
+      chef_config[:chef_server_url] = "https://chef.sspti.me"
     end
     setup_node_script << "exit 0\n"
 
@@ -101,7 +101,7 @@ validation_client_name "#{chef_config[:validation_client_name]}"
 
     say "\nBootstrapping #{shell.set_color(server.name, :bold)}..."
 
-    ssh = Chef::Knife::Ssh.new
+    ssh = ::Chef::Knife::Ssh.new
     ssh.name_args = [ server.addresses["public"][0], "/bin/bash /etc/setup-node && /usr/local/bin/chef-client -j /etc/chef/first-boot.json" ]
     ssh.config[:ssh_user] = "root"
     ssh.config[:manual] = true
@@ -133,9 +133,9 @@ validation_client_name "#{chef_config[:validation_client_name]}"
 
     def chef_config
       unless defined?(@_chef_config_loaded)
-        Chef::Config.from_file(options[:chef_config])
+        ::Chef::Config.from_file(options[:chef_config])
         @_chef_config_loaded = true
       end
-      Chef::Config
+      ::Chef::Config
     end
 end

data/lib/ssp/application/office_node.rb

@@ -73,7 +73,7 @@ cat <<'EOP'
 127.0.0.1	localhost localhost.localdomain
 #{ip}	#{fqdn} #{fqdn.split(".").first}
 
-192.168.1.82	basil basil.secretsaucepartners.com chef.secretsaucepartners.com
+192.168.1.82	basil basil.sspti.me chef.sspti.me
 EOP
 ) > /etc/hosts
 
@@ -131,6 +131,7 @@ EOH
     command = <<EOH
 bash -c '
 xm shutdown #{hostname}
+umount /mnt/#{hostname}
 sleep 3
 rm /etc/xen/#{hostname}.cfg
 lvremove -f vg/#{hostname}-{root,swap}'
@@ -145,14 +146,14 @@ EOH
   protected
     def chef_config
       unless defined?(@_chef_config_loaded)
-        Chef::Config.from_file(options[:chef_config])
+        ::Chef::Config.from_file(options[:chef_config])
         @_chef_config_loaded = true
       end
-      Chef::Config
+      ::Chef::Config
     end
 
     def ssh_run(host, command, user = options[:ssh_user], pass = options[:ssh_password])
-      ssh = Chef::Knife::Ssh.new
+      ssh = ::Chef::Knife::Ssh.new
       ssh.name_args = [ host, command ]
       ssh.config[:ssh_user] = user
       ssh.config[:password] = pass
@@ -161,9 +162,9 @@ EOH
       begin
         ssh.run
       rescue Net::SSH::AuthenticationFailed
-        unless config[:ssh_password]
-          puts "Failed to authenticate #{config[:ssh_user]} - trying password auth"
-          ssh = Chef::Knife::Ssh.new
+        unless pass
+          puts "Failed to authenticate #{user} - trying password auth"
+          ssh = ::Chef::Knife::Ssh.new
           ssh.name_args = [ host, command ]
           ssh.config[:ssh_user] = user
           ssh.config[:manual] = true

data/lib/ssp/version.rb

@@ -1,3 +1,3 @@
 module SSP
-  VERSION = "0.2"
+  VERSION = "0.3"
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ssp
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
-  - 2
-  version: "0.2"
+  - 3
+  version: "0.3"
 platform: ruby
 authors: 
 - !binary |
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-05 00:00:00 +02:00
+date: 2010-07-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,6 +63,7 @@ files:
 - bin/ssp
 - lib/ssp/app.rb
 - lib/ssp/application/bags.rb
+- lib/ssp/application/chef.rb
 - lib/ssp/application/node.rb
 - lib/ssp/application/office_node.rb
 - lib/ssp/application/pair.rb