knife-xapi 0.1.5 → 0.2.1

data/lib/chef/knife/xapi_base.rb

@@ -28,6 +28,7 @@ end
 
 require 'chef/knife'
 require 'units/standard'
+require 'xenapi'
 
 class Chef::Knife
     module XapiBase
@@ -84,6 +85,11 @@ class Chef::Knife
       end
     end
 
+    def locate_config_value(key)
+      key = key.to_sym
+      Chef::Config[:knife][key] || config[key]
+    end
+
     # get template by name_label
     def get_template(template)
       xapi.VM.get_by_name_label(template).first

data/lib/chef/knife/xapi_guest_create.rb

@@ -25,14 +25,14 @@ class Chef
   class Knife
     class XapiGuestCreate < Knife
       include Chef::Knife::XapiBase
+      require 'timeout'
 
-      banner "knife xapi guest create NAME [NETWORKS] (options)"
+      deps do
+        require 'chef/knife/bootstrap'
+        Chef::Knife::Bootstrap.load_deps
+      end
 
-      option :bootstrap,
-        :short => "-B BOOTSTRAP",
-        :long => "--xapi-bootstrap BOOTSTRAP",
-        :description => "bootstrap template to push to the server",
-        :proc => Proc.new { |bootstrap| Chef::Config[:knife][:xapi_bootstrap] = bootstrap }
+      banner "knife xapi guest create NAME [NETWORKS] (options)"
 
       option :vm_template,
         :short => "-T Template Name Label",
@@ -40,6 +40,12 @@ class Chef
         :description => "xapi template name to create from. accepts an string or regex",
         :proc => Proc.new { |template| Chef::Config[:knife][:xapi_vm_template] = template }
 
+      option :domain,
+        :short => "-f Name",
+        :long => "--domain Name",
+        :description => "the domain name for the guest",
+        :proc => Proc.new { |domain| Chef::Config[:knife][:xapi_domainname] = domain }
+
       option :install_repo,
         :short => "-R If you're using a builtin template you will need to specify a repo url",
         :long => "--xapi-install-repo",
@@ -76,13 +82,131 @@ class Chef
         :description => "Ammount of memory the VM should have specify with m g etc 512m, 2g if no unit spcified it assumes gigabytes",
         :proc => Proc.new {|mem| Chef::Config[:knife][:xapi_mem] = mem } 
 
+      option :chef_node_name,
+        :short => "-N NAME",
+        :long => "--node-name NAME",
+        :description => "The Chef node name for your new node"
+
+      option :ssh_key_name,
+        :short => "-S KEY",
+        :long => "--ssh-key KEY",
+        :description => "The SSH key id",
+        :proc => Proc.new { |key| Chef::Config[:knife][:xapi_ssh_key_id] = key }
+
+      option :ssh_user,
+        :short => "-x USERNAME",
+        :long => "--ssh-user USERNAME",
+        :description => "The ssh username",
+        :default => "root"
+
+      option :ssh_password,
+        :short => "-P PASSWORD",
+        :long => "--ssh-password PASSWORD",
+        :description => "The ssh password"
+
+      option :ssh_port,
+        :short => "-p PORT",
+        :long => "--ssh-port PORT",
+        :description => "The ssh port",
+        :default => "22",
+        :proc => Proc.new { |key| Chef::Config[:knife][:ssh_port] = key }
+
+      option :bootstrap_version,
+        :long => "--bootstrap-version VERSION",
+        :description => "The version of Chef to install",
+        :proc => Proc.new { |v| Chef::Config[:knife][:bootstrap_version] = v }
+
+      option :distro,
+        :short => "-d DISTRO",
+        :long => "--distro DISTRO",
+        :description => "Bootstrap a distro using a template",
+        :proc => Proc.new { |d| Chef::Config[:knife][:distro] = d },
+        :default => "ubuntu10.04-gems"
+
+      option :template_file,
+        :short => "-F FILEPATH",
+        :long => "--template-file TEMPLATE",
+        :description => "Full path to location of template to use",
+        :proc => Proc.new { |t| Chef::Config[:knife][:template_file] = t },
+        :default => false
+     
+      option :run_list,
+        :short => "-r RUN_LIST",
+        :long => "--run-list RUN_LIST",
+        :description => "Comma separated list of roles/recipes to apply",
+        :proc => lambda { |o| o.split(/[\s,]+/) },
+        :default => [] 
+
+      def tcp_test_ssh(hostname)
+        tcp_socket = TCPSocket.new(hostname, config[:ssh_port])
+        readable = IO.select([tcp_socket], nil, nil, 5)
+        if readable
+          Chef::Log.debug("sshd accepting connections on #{hostname}, banner is #{tcp_socket.gets}")
+          yield
+          true
+        else
+          false
+        end
+      rescue SocketError
+        sleep 2
+        false
+      rescue Errno::ETIMEDOUT
+        false
+      rescue Errno::EPERM
+        false
+      rescue Errno::ECONNREFUSED
+        sleep 2
+        false
+      # This happens on EC2 quite often
+      rescue Errno::EHOSTUNREACH
+        sleep 2
+        false
+      ensure
+        tcp_socket && tcp_socket.close
+      end
+
+      def get_guest_ip(vm_ref)
+        begin
+          timeout(480) do
+            ui.msg "Waiting for guest ip address" 
+            guest_ip = ""
+            while guest_ip.empty?
+              print(".") 
+              sleep  @initial_sleep_delay ||=  10
+              vgm =  xapi.VM.get_guest_metrics(vm_ref)
+              next if "OpaqueRef:NULL" == vgm
+              networks = xapi.VM_guest_metrics.get_networks(vgm)
+              if networks.has_key?("0/ip")
+                guest_ip = networks["0/ip"]
+              end
+            end
+            puts "\n" 
+            return guest_ip
+          end 
+        rescue Timeout::Error
+          ui.msg "Timeout waiting for XAPI to report IP address "
+        end
+      end
+
       # destroy/remove VM refs and exit
       def cleanup(vm_ref)
-        ui.warn "Clenaing up work and exiting"
-        xapi.VM.destroy(vm_ref)
+        ui.warn "Cleaning up work and exiting"
+        # shutdown and dest
+        unless xapi.VM.get_power_state(vm_ref) == "Halted"
+          print "Shutting down Guest"
+          task = xapi.Async.VM.hard_shutdown(vm_ref)
+          wait_on_task(task)
+          print " #{h.color "Done", :green} \n"
+        end
+
+        print "Destroying Guest"
+        task = xapi.Async.VM.destroy(vm_ref)
+        wait_on_task(task)
+        print " #{h.color "Done", :green} \n"
         exit 1 
       end
 
+
       def run 
         server_name = @name_args[0]
         $stdout.sync = true
@@ -115,8 +239,13 @@ class Chef
           # setup the Boot args
           #
           boot_args = Chef::Config[:knife][:xapi_kernel_params] || "graphical utf8"
+          domainname = Chef::Config[:knife][:xapi_domainname] || ""
+
           # if no hostname param set hostname to given vm name
           boot_args << " hostname=#{server_name}" unless boot_args.match(/hostname=.+\s?/) 
+          # if domainname is supplied we put that in there as well
+          boot_args << " domainname=#{domainname}" unless boot_args.match(/domainname=.+\s?/) 
+
           ui.msg "Setting Boot Args: #{h.color boot_args, :cyan}"
           xapi.VM.set_PV_args( vm_ref, boot_args ) 
 
@@ -156,12 +285,13 @@ class Chef
           ui.msg "Provisioning new Guest: #{h.color(vm_ref, :bold, :cyan )}" 
           provisioned = xapi.VM.provision(vm_ref)
 
-          ui.msg "Starting new Guest: #{h.color( provisioned, :cyan)} "
+          ui.msg "Starting new Guest #{h.color( provisioned, :cyan)} "
           
           task = xapi.Async.VM.start(vm_ref, false, true)
           wait_on_task(task) 
           ui.msg( "#{ h.color "Done!", :green}" )
 
+          exit 0 unless locate_config_value(:run_list)       
         rescue Exception => e
           ui.msg "#{h.color 'ERROR:'} #{h.color( e.message, :red )}"
           # have to use join here to pass a string to highline
@@ -170,7 +300,52 @@ class Chef
           
           cleanup(vm_ref)
         end
-        # TODO: bootstrap
+
+        guest_addr = get_guest_ip(vm_ref)
+        if guest_addr.nil? or guest_addr.empty?
+          ui.msg("ip seems wrong using host+domain name instead")
+          guest_addr = "#{host_name}.#{domainname}"
+        end
+        ui.msg "Trying to connect to guest @ #{guest_addr} "
+
+        begin
+          timeout(480) do
+            print(".") until tcp_test_ssh(guest_addr) {
+              sleep @initial_sleep_delay ||=  10
+              puts("done")
+            }
+          end
+        rescue Timeout::Error
+          ui.msg "Timeout trying to login cleaning up"
+          cleanup(vm_ref)
+        end
+
+
+        begin 
+          bootstrap = Chef::Knife::Bootstrap.new
+          bootstrap.name_args = [ guest_addr ]
+          bootstrap.config[:run_list] = config[:run_list]
+          bootstrap.config[:ssh_user] = config[:ssh_user]
+          bootstrap.config[:ssh_port] = config[:ssh_port]
+          bootstrap.config[:ssh_password] = config[:ssh_password]
+          bootstrap.config[:identity_file] = config[:identity_file]
+          bootstrap.config[:chef_node_name] = config[:chef_node_name] || server_name
+          bootstrap.config[:bootstrap_version] = locate_config_value(:bootstrap_version)
+          bootstrap.config[:distro] = locate_config_value(:distro)
+          bootstrap.config[:use_sudo] = true unless config[:ssh_user] == 'root'
+          bootstrap.config[:template_file] = locate_config_value(:template_file)
+          bootstrap.config[:environment] = config[:environment]
+          bootstrap.config[:host_key_verify] = false
+          bootstrap.config[:run_list] = config[:run_list]
+          
+          bootstrap.run
+        rescue Exception => e 
+          ui.msg "#{h.color 'ERROR:'} #{h.color( e.message, :red )}"
+          puts "Nested backtrace:"
+          ui.msg "#{h.color( e.backtrace.join("\n"), :yellow)}"
+          cleanup(vm_ref)
+        end
+
       end
 
     end

data/lib/knife-xapi/version.rb

@@ -1,3 +1,3 @@
 module KnifeXenserver
-  VERSION = "0.1.5"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-xapi
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-23 00:00:00.000000000 Z
+date: 2012-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Xen API Support for Chef's Knife Command