kytoon 1.3.8 → 1.3.9

data/CHANGELOG

@@ -1,3 +1,9 @@
+* Wed Jun 12 2013 Dan Prince <dprince@redhat.com> - 1.3.9
+  -XenServer: Extract configure_host_network (matelaket)
+  -XenServer: Fix: Configure host network before configuring nodes (matelaket)
+  -Remote exec fix - abstract connection checking loop (matelaket)
+  -XenServer: check domid before ssh key injection (dprince)
+
 * Thu May 30 2013 Dan Prince <dprince@redhat.com> - 1.3.8
   -Re-release 1.3.7 as 1.3.8 to fix bad gem.
 

data/VERSION

@@ -1 +1 @@
-1.3.8
+1.3.9

data/lib/kytoon/providers/xenserver/server_group.rb

@@ -188,6 +188,7 @@ fi
         create_instance(sg.gateway_ip, server['image_path'], server['hostname'], server['mac'], sg.bridge, host_ssh_public_key)
         network_type = sg.network_type
         if network_type == 'static' then
+            configure_host_network(sg)
             configure_static_networking(sg.gateway_ip, server['hostname'], server['ip_address'], sg.netmask, sg.gateway, sg.broadcast, server['mac'], sg.dns_nameserver)
         else
           raise "Unsupported network type '#{sg.network_type}'"
@@ -231,21 +232,28 @@ fi
     end
   end
 
-  def self.init_host(sg)
+  def self.configure_host_network(sg)
 
     cidr = IPAddr.new(sg.netmask).to_i.to_s(2).count("1")
 
-    hosts_file_data = "127.0.0.1\tlocalhost localhost.localdomain\n"
-    sg.servers.each do |server|
-      hosts_file_data += "#{server['ip_address']}\t#{server['hostname']}\t#{server['hostname']}.local\n"
-    end
-
     Kytoon::Util.remote_exec(%{
 # Add first IP to bridge
 if ! ip a | grep #{sg.gateway}/#{cidr} | grep #{sg.bridge}; then
   ip a add #{sg.gateway}/#{cidr} dev #{sg.bridge}
 fi
+    }, sg.gateway_ip)
+  end
+
+  def self.init_host(sg)
 
+    hosts_file_data = "127.0.0.1\tlocalhost localhost.localdomain\n"
+    sg.servers.each do |server|
+      hosts_file_data += "#{server['ip_address']}\t#{server['hostname']}\t#{server['hostname']}.local\n"
+    end
+
+    configure_host_network(sg)
+
+    Kytoon::Util.remote_exec(%{
 cat > /etc/hosts <<-EOF_CAT
 #{hosts_file_data}
 EOF_CAT
@@ -293,6 +301,10 @@ echo 1 > /proc/sys/net/ipv4/ip_forward
 
       # inject ssh from host
       DOMID=$(xe vm-param-get uuid=$UUID param-name="dom-id")
+      if [ "$DOMID" == "-1" -o -z "$DOMID" ]; then
+        echo "Unable to find valid domain ID."
+        exit 1
+      fi
       xenstore-rm -s /local/domain/$DOMID/data/guest/ssh_key 2> /dev/null
       xenstore-write -s /local/domain/$DOMID/data/host/ssh_key '{"name": "injectfile", "value": "#{file_data}"}'
       until [ -n "$INJECT_RETVAL" ]; do

data/lib/kytoon/util.rb

@@ -77,13 +77,23 @@ module Util
     (retry_attempts+1).times do |count|
       sleep retry_sleep if count > 1
       out=%x{
-ssh #{SSH_OPTS} root@#{gateway_ip} bash <<-"REMOTE_EXEC_EOF"
-#{script_text}
-REMOTE_EXEC_EOF
+ssh #{SSH_OPTS} root@#{gateway_ip} true
       }
       retval=$?
       break if retval.success?
     end
+
+    if not retval.success?
+      raise KytoonException, "Failed to connect to #{gateway_ip}."
+    end
+
+    out=%x{
+ssh #{SSH_OPTS} root@#{gateway_ip} bash <<-"REMOTE_EXEC_EOF"
+#{script_text}
+REMOTE_EXEC_EOF
+      }
+    retval=$?
+
     if block_given? then
       yield retval.success?, out
     else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kytoon
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.3.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -289,7 +289,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4125311850560974611
+      hash: 4155049120962533494
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: