kytoon 1.3.0 → 1.3.1

data/CHANGELOG

@@ -1,4 +1,10 @@
-* Mon Dec 13 2012 Dan Prince <dprince@redhat.com> - 1.3.0
+* Thu Dec 13 2012 Dan Prince <dprince@redhat.com> - 1.3.1
+  -SSH config fixes for libvirt and openstack providers. You can now
+   ssh to localhost from the gateway node. (weird but constistent)
+  -Add retry_attempts to remote_exec method
+  -Update OpenStack provider to retry initial ssh config up to 3 times.
+
+* Thu Dec 13 2012 Dan Prince <dprince@redhat.com> - 1.3.0
   -OpenStack: Switch to Fog.
   -OpenStack: Add support for automatic floating IP configuration via
    'assign_floating_ip' in server group json files.

data/README.md

@@ -94,6 +94,8 @@ For Openstack:
 
 For Libvirt (uses libvirt DHCP server for instance IP configuration):
 
+NOTE: Kytoon assumes you are using NAT networking for your libvirt instances. If you use bridged networking the IP discovery mechanism will fail.
+
 ```bash
 
 	cat > config/server_group.json <<-"EOF_CAT"

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.3.1

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

@@ -174,7 +174,7 @@ class ServerGroup
     puts "Copying hosts files..."
 
 gateway_ssh_config = %{
-[ -d .ssh ] || mkdir .ssh
+mkdir -p .ssh
 cat > .ssh/id_rsa <<-EOF_CAT
 #{private_ssh_key}
 EOF_CAT
@@ -182,7 +182,7 @@ chmod 600 .ssh/id_rsa
 cat > .ssh/id_rsa.pub <<-EOF_CAT
 #{public_ssh_key}
 EOF_CAT
-chmod 600 .ssh/id_rsa.pub
+chmod 644 .ssh/id_rsa.pub
 cat > .ssh/config <<-EOF_CAT
 StrictHostKeyChecking no
 EOF_CAT
@@ -190,9 +190,9 @@ chmod 600 .ssh/config
 }
 
 node_ssh_config= %{
-[ -d .ssh ] || mkdir .ssh
-cat > .ssh/authorized_keys <<-EOF_CAT
-#{public_ssh_key}
+mkdir -p .ssh
+cat >> .ssh/authorized_keys <<-EOF_CAT
+#{public_ssh_key}\n
 EOF_CAT
 chmod 600 .ssh/authorized_keys
 }
@@ -208,7 +208,8 @@ hostname "#{server['hostname']}"
 if [ -f /etc/sysconfig/network ]; then
   sed -e "s|^HOSTNAME.*|HOSTNAME=#{server['hostname']}|" -i /etc/sysconfig/network
 fi
-#{server['gateway'] == 'true' ? gateway_ssh_config : node_ssh_config}
+#{server['gateway'] == 'true' ? gateway_ssh_config : ""}
+#{node_ssh_config}
       }, server['ip_address']) do |ok, out|
         if not ok
           puts out
@@ -343,9 +344,8 @@ if [ -n "$LV_ROOT" ]; then
     run : \
     mount $LV_ROOT / : \
     sh "/bin/mkdir -p /root/.ssh" : \
-    write-append /root/.ssh/authorized_keys "#{ssh_public_key}" : \
-    sh "/bin/chmod 700 /root/.ssh" : \
-    sh "/bin/chmod 600 /root/.ssh/authorized_keys"
+    write-append /root/.ssh/authorized_keys "#{ssh_public_key}\n" : \
+    sh "/bin/chmod -R 700 /root/.ssh"
 fi
 
 #{sudo} virsh setmaxmem #{domain_name} #{instance_memory}

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

@@ -188,7 +188,7 @@ class ServerGroup
     puts "Copying hosts files..."
 
 gateway_ssh_config = %{
-[ -d .ssh ] || mkdir .ssh
+mkdir -p .ssh
 cat > .ssh/id_rsa <<-EOF_CAT
 #{private_ssh_key}
 EOF_CAT
@@ -196,7 +196,7 @@ chmod 600 .ssh/id_rsa
 cat > .ssh/id_rsa.pub <<-EOF_CAT
 #{public_ssh_key}
 EOF_CAT
-chmod 600 .ssh/id_rsa.pub
+chmod 644 .ssh/id_rsa.pub
 cat > .ssh/config <<-EOF_CAT
 StrictHostKeyChecking no
 EOF_CAT
@@ -204,9 +204,9 @@ chmod 600 .ssh/config
 }
 
 node_ssh_config= %{
-[ -d .ssh ] || mkdir .ssh
-cat > .ssh/authorized_keys <<-EOF_CAT
-#{public_ssh_key}
+mkdir -p .ssh
+cat >> .ssh/authorized_keys <<-EOF_CAT
+#{public_ssh_key}\n
 EOF_CAT
 chmod 600 .ssh/authorized_keys
 }
@@ -222,8 +222,9 @@ hostname "#{server['hostname']}"
 if [ -f /etc/sysconfig/network ]; then
   sed -e "s|^HOSTNAME.*|HOSTNAME=#{server['hostname']}|" -i /etc/sysconfig/network
 fi
-#{server['gateway'] == 'true' ? gateway_ssh_config : node_ssh_config}
-      }, server['ip_address']) do |ok, out|
+#{server['gateway'] == 'true' ? gateway_ssh_config : ""}
+#{node_ssh_config}
+      }, server['ip_address'], 3) do |ok, out|
         if not ok
           puts out
           raise KytoonException, "Failed to copy host file to instance #{server['hostname']}."

data/lib/kytoon/util.rb

@@ -66,23 +66,30 @@ module Util
     end
   end
 
-  def self.remote_exec(script_text, gateway_ip)
+  def self.remote_exec(script_text, gateway_ip, retry_attempts=0, retry_sleep=5)
     if gateway_ip.nil?
       sg=ServerGroup.get
       gateway_ip=sg.gateway_ip
     end
 
-    out=%x{
+    retval=nil
+    out=nil
+    (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
-    }
-    retval=$?
+      }
+      retval=$?
+      break if retval.success?
+    end
     if block_given? then
       yield retval.success?, out
     else
       return [retval.success?, out]
     end
+
   end
 
   def self.remote_multi_exec(hosts, script_text, gateway_ip)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kytoon
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2012-12-14 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: 3174001929267576694
+      hash: -598378511131357418
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: