knife-xenserver 1.0.1 → 1.1

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 1.1 - 2012/10/21
+
+* Fixed --no-host-key-verify vm create flag
+* added power on/off commands
+* Allow setting of network information on create for Ubuntu systems 
+  (@krobertson, @adamlau)
+
+  See https://github.com/bvox/knife-xenserver/pull/1
+
 # 0.1.0 - 2012/04/04
 
 * Initial release

data/README.md

@@ -61,6 +61,15 @@ Create a VM from template and add two custom VIFs in networks 'Integration-VLAN'
                               --vm-networks 'Integration-VLAN,Another-VLAN' \
                               --mac-addresses 11:22:33:44:55:66
 
+Create a VM from template and supply ip/host/domain configuration. Requires installation of xe-automater scripts (https://github.com/adamlau/xenserver-automater)
+
+    knife xenserver vm create   --vm-template my-template -x root --keep-template-networks \
+                                --vm-name my-hostname \
+                                --vm-ip 172.20.1.25 --vm-netmask 255.255.0.0 --vm-gateway 172.20.0.1 --vm-dns 172.20.0.3 \
+                                --vm-domain my-domain.local
+
+The domU/guest will also need xe-guest-utilities installed. You can then list xenstore attributes running 'xenstore-ls vm-data' inside domU.
+
 List hypervisor networks
 
     knife xenserver network list

data/lib/chef/knife/xenserver_vm_create.rb

@@ -103,12 +103,11 @@ class Chef
         :long => "--identity-file IDENTITY_FILE",
         :description => "The SSH identity file used for authentication"
       
-      option :no_host_key_verify,
-        :long => "--no-host-key-verify",
+      option :host_key_verify,
+        :long => "--[no-]host-key-verify",
         :description => "Disable host key verification",
         :boolean => true,
-        :default => false,
-        :proc => Proc.new { true }
+        :default => true
       
       option :skip_bootstrap,
         :long => "--skip-bootstrap",
@@ -140,6 +139,26 @@ class Chef
         :description => "Mac address list",
         :default => nil
 
+      option :vm_ip,
+        :long => '--vm-ip IP',
+        :description => 'IP address to set in xenstore'
+
+      option :vm_gateway,
+        :long => '--vm-gateway GATEWAY',
+        :description => 'Gateway address to set in xenstore'
+
+      option :vm_netmask,
+        :long => '--vm-netmask NETMASK',
+        :description => 'Netmask to set in xenstore'
+
+      option :vm_dns,
+        :long => '--vm-dns NAMESERVER',
+        :description => 'DNS servers to set in xenstore'
+
+      option :vm_domain,
+        :long => '--vm-domain DOMAIN',
+        :description => 'DOMAIN of host to set in xenstore'
+
       def tcp_test_ssh(hostname)
         tcp_socket = TCPSocket.new(hostname, 22)
         readable = IO.select([tcp_socket], nil, nil, 5)
@@ -173,6 +192,17 @@ class Chef
           exit 1
         end
 
+        unless config[:vm_gateway]
+          if config[:vm_ip]
+            last_octet = Chef::Config[:knife][:xenserver_default_vm_gateway_last_octet] || 1
+            config[:vm_gateway] = config[:vm_ip].gsub(/\.\d+$/, ".#{last_octet}")
+          end
+        end
+
+        config[:vm_netmask] ||= Chef::Config[:knife][:xenserver_default_vm_netmask]
+        config[:vm_dns] ||= Chef::Config[:knife][:xenserver_default_vm_dns]
+        config[:vm_domain] ||= Chef::Config[:knife][:xenserver_default_vm_domain]
+
         template = connection.servers.templates.find do |s| 
           (s.name == config[:vm_template]) or (s.uuid == config[:vm_template])
         end
@@ -201,6 +231,19 @@ class Chef
         vm.set_attribute 'memory_limits', mem, mem, mem, mem
         vm.set_attribute 'VCPUs_max', config[:vm_cpus]
         vm.set_attribute 'VCPUs_at_startup', config[:vm_cpus]
+
+        # network configuration through xenstore
+        attrs = {}
+        (attrs['vm-data/ip'] = config[:vm_ip]) if config[:vm_ip]
+        (attrs['vm-data/gw'] = config[:vm_gateway]) if config[:vm_gateway]
+        (attrs['vm-data/netmask'] = config[:vm_netmask]) if config[:vm_netmask]
+        (attrs['vm-data/dns'] = config[:vm_dns]) if config[:vm_dns]
+        (attrs['vm-data/dm'] = config[:vm_domain]) if config[:vm_domain]
+        if !attrs.empty?
+          puts "Adding attributes to xenstore..."
+          vm.set_attribute 'xenstore_data', attrs
+        end
+
         if config[:vm_tags]
           vm.set_attribute 'tags', config[:vm_tags].split(',')
         end
@@ -217,38 +260,47 @@ class Chef
           timeout = 180
           found = connection.servers.all.find { |v| v.name == vm.name }
           servers = connection.servers
-          loop do 
-            begin
-              vm.refresh
-              if not vm.guest_metrics.nil? and not vm.guest_metrics.networks.empty?
-                networks = []
-                vm.guest_metrics.networks.each do |k,v|
-                  networks << v
+          if config[:vm_ip]
+            vm.refresh
+            print "\nTrying to #{'SSH'.yellow} to #{config[:vm_ip].yellow}... "
+            print(".") until tcp_test_ssh(config[:vm_ip]) do
+              sleep @initial_sleep_delay ||= 10; puts(" done")
+              @ssh_ip = config[:vm_ip]
+            end
+          else
+            loop do
+              begin
+                vm.refresh
+                if not vm.guest_metrics.nil? and not vm.guest_metrics.networks.empty?
+                  networks = []
+                  vm.guest_metrics.networks.each do |k,v|
+                    networks << v
+                  end
+                  networks = networks.join(",")
+                  puts
+                  puts "\n#{ui.color("Server IPs:", :cyan)} #{networks}"
+                  break
                 end
-                networks = networks.join(",")
+              rescue Fog::Errors::Error
+                print "\r#{ui.color('Waiting a valid IP', :magenta)}..." + "." * (100 - timeout)
+              end
+              sleep 1
+              timeout -= 1
+              if timeout == 0
                 puts
-                puts "\n#{ui.color("Server IPs:", :cyan)} #{networks}"
-                break
+                ui.error "Timeout trying to reach the VM. Couldn't find the IP address."
+                exit 1
               end
-            rescue Fog::Errors::Error
-              print "\r#{ui.color('Waiting a valid IP', :magenta)}..." + "." * (100 - timeout)
-            end
-            sleep 1
-            timeout -= 1
-            if timeout == 0
-              puts
-              ui.error "Timeout trying to reach the VM. Couldn't find the IP address."
-              exit 1
             end
-          end
-          print "\n#{ui.color("Waiting for sshd... ", :magenta)}"
-          vm.guest_metrics.networks.each do |k,v|
-            print "\nTrying to #{'SSH'.yellow} to #{v.yellow}... "
-            print(".") until tcp_test_ssh(v) do
-              sleep @initial_sleep_delay ||= 10; puts(" done") 
-              @ssh_ip = v
+            print "\n#{ui.color("Waiting for sshd... ", :magenta)}"
+            vm.guest_metrics.networks.each do |k,v|
+              print "\nTrying to #{'SSH'.yellow} to #{v.yellow}... "
+              print(".") until tcp_test_ssh(v) do
+                sleep @initial_sleep_delay ||= 10; puts(" done")
+                @ssh_ip = v
+              end
+              break if @ssh_ip
             end
-            break if @ssh_ip
           end
 
           bootstrap_for_node(vm).run 
@@ -277,7 +329,7 @@ class Chef
         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[:no_host_key_verify] = config[:no_host_key_verify]
+        bootstrap.config[:host_key_verify] = config[:host_key_verify]
         bootstrap.config[:ssh_password] = config[:ssh_password]
         bootstrap
       end

data/lib/chef/knife/xenserver_vm_poweroff.rb

@@ -0,0 +1,59 @@
+#
+# Author:: Sergio Rubio (<rubiojr@bvox.net>)
+# Copyright:: Copyright (c) 2012 Sergio Rubio
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/knife/xenserver_base'
+
+class Chef
+  class Knife
+    class XenserverVmPoweroff < Knife
+
+      include Knife::XenserverBase
+
+      banner "knife xenserver vm poweroff VM_NAME [VM_NAME] (options)"
+      
+      option :hard,
+        :long => "--hard",
+        :description => "Force VM shutdown",
+        :boolean => true,
+        :default => false,
+        :proc => Proc.new { true }
+
+      def run
+        powered_off = []
+        connection.servers.each do |vm|
+          @name_args.each do |vm_name|
+            if (vm_name == vm.name) or (vm_name == vm.uuid)
+              confirm("Do you really want to #{'poweroff'.bold.red} this virtual machine #{vm.name.bold.red}")
+              if config[:hard]
+                vm.stop 'hard' 
+              else
+                vm.stop 'clean'
+              end
+              powered_off << vm_name
+              ui.info("#{'Powered off'.yellow} virtual machine #{vm.name.yellow} [uuid: #{vm.uuid}]")
+            end
+          end
+        end
+        @name_args.each do |vm_name|
+          ui.warn "Virtual Machine #{vm_name} not found" if not powered_off.include?(vm_name)
+        end
+      end
+
+    end
+  end
+end

data/lib/chef/knife/xenserver_vm_poweron.rb

@@ -0,0 +1,47 @@
+#
+# Author:: Sergio Rubio (<rubiojr@bvox.net>)
+# Copyright:: Copyright (c) 2012 Sergio Rubio
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/knife/xenserver_base'
+
+class Chef
+  class Knife
+    class XenserverVmPoweron < Knife
+
+      include Knife::XenserverBase
+
+      banner "knife xenserver vm poweron VM_NAME [VM_NAME] (options)"
+      
+      def run
+        powered_on = []
+        connection.servers.each do |vm|
+          @name_args.each do |vm_name|
+            if (vm_name == vm.name) or (vm_name == vm.uuid)
+              vm.start
+              powered_on << vm_name
+              ui.info("#{'Powered on'.yellow} virtual machine #{vm.name.yellow} [uuid: #{vm.uuid}]")
+            end
+          end
+        end
+        @name_args.each do |vm_name|
+          ui.warn "Virtual Machine #{vm_name} not found" if not powered_on.include?(vm_name)
+        end
+      end
+
+    end
+  end
+end

data/lib/knife-xenserver/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module XenServer
-    VERSION = "1.0.1"
+    VERSION = "1.1"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

data/vendor/fog/lib/fog/xenserver/requests/compute/add_attribute.rb

@@ -0,0 +1,25 @@
+module Fog
+  module Compute
+    class XenServer
+
+      class Real
+        
+        require 'fog/xenserver/parser'
+        
+        def add_attribute( klass, ref, attr_name, *value )
+          @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => "#{klass}.add_#{attr_name.gsub('-','_')}"}, ref, *value)
+        end
+        
+      end
+      
+      class Mock
+        
+        def add_attribute( klass, ref, attr_name, value )
+          Fog::Mock.not_implemented
+        end
+        
+      end
+
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-xenserver
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: '1.1'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-11 00:00:00.000000000 Z
+date: 2012-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: terminal-table
@@ -129,7 +129,10 @@ files:
 - lib/chef/knife/xenserver_vm_create.rb
 - lib/chef/knife/xenserver_vm_delete.rb
 - lib/chef/knife/xenserver_vm_list.rb
+- lib/chef/knife/xenserver_vm_poweroff.rb
+- lib/chef/knife/xenserver_vm_poweron.rb
 - lib/knife-xenserver/version.rb
+- vendor/fog/lib/fog/xenserver/requests/compute/add_attribute.rb
 homepage: http://github.com/rubiojr/knife-xenserver
 licenses: []
 post_install_message: