kytoon 1.3.3 → 1.3.4

data/CHANGELOG

@@ -1,3 +1,9 @@
+* Sun Mar 3 2013 Dan Prince <dprince@redhat.com> - 1.3.4
+  -Improve libvirt file injection so it works with or without LVM. (sthaha)
+  -Fix 'kytoon ssh' so it works with multiple args. (sthaha)
+  -Exits with a non-zero value (1) on task failure. (sthaha)
+  -Verbose output when image creation fails. (sthaha)
+
 * Tue Feb 12 2013 Dan Prince <dprince@redhat.com> - 1.3.3
   -Update SELinux to set correct context on /root/.ssh as well.
 

data/VERSION

@@ -1 +1 @@
-1.3.3
+1.3.4

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

@@ -100,18 +100,18 @@ class ServerGroup
 
   def server_names
 
-    names=[]  
+    names=[]
 
     servers.each do |server|
       if block_given? then
         yield server['hostname']
       else
         names << server['hostname']
-      end  
+      end
     end
 
     names
-    
+
   end
 
   def cache_to_disk
@@ -297,8 +297,7 @@ fi
 
   def self.create_instance(group_id, inst_name, memory_gigs, original, original_xml, disk_path, create_cow, selinux_enabled, ssh_public_key, sudo)
 
-    selinux_enabled = selinux_enabled =~ /(true|t|yes|y|1)$/i ? "true" : ""
-
+    selinux_enabled, guestfs_selinux_arg = selinux_enabled =~ /(true|t|yes|y|1)$/i ? ["true", '--selinux']: ["", '']
     puts "Creating instance: #{inst_name}"
     instance_memory = (KIB_PER_GIG * memory_gigs.to_f).to_i
     original_disk_path = source_disk_filename(original, original_xml) #cow only
@@ -326,7 +325,9 @@ if [ -n "#{create_cow}" ]; then
     --preserve-data \
     || { echo "failed to virt-clone"; exit 1; }
 
-  #{sudo} qemu-img create -f qcow2 -o backing_file=#{original_disk_path} "#{disk_path}"
+  #{sudo} qemu-img create -f qcow2 -o backing_file=#{original_disk_path} "#{disk_path}" ||  { \
+    echo 'Failed to create a copy-on-write image of #{original_disk_path }'; exit 1;
+  }
 
 else
 
@@ -339,27 +340,24 @@ else
 
 fi
 
-LV_ROOT=$(#{sudo} virt-filesystems -a #{disk_path} --logical-volumes | grep root)
-# If using LVM we inject the ssh key this way
-if [ -n "$LV_ROOT" ]; then
-  if [ -n "#{selinux_enabled}" ]; then
-    #{sudo} guestfish --selinux add #{disk_path} : \
-      run : \
-      mount $LV_ROOT / : \
-      sh "/bin/mkdir -p /root/.ssh" : \
-      write-append /root/.ssh/authorized_keys "#{ssh_public_key}\n" : \
-      sh "/bin/chmod -R 700 /root/.ssh" : \
-      sh "load_policy -i" : \
-      sh "chcon unconfined_u:object_r:user_home_t:s0 /root/.ssh" : \
-      sh "chcon system_u:object_r:ssh_home_t /root/.ssh/authorized_keys"
-  else
-    #{sudo} guestfish add #{disk_path} : \
-      run : \
-      mount $LV_ROOT / : \
-      sh "/bin/mkdir -p /root/.ssh" : \
-      write-append /root/.ssh/authorized_keys "#{ssh_public_key}\n" : \
-      sh "/bin/chmod -R 700 /root/.ssh"
-  fi
+#Copy the ssh-key
+#{sudo}  guestfish  -a #{disk_path} -i  <<- __EOF__
+    mkdir-p /root/.ssh
+    write-append /root/.ssh/authorized_keys "#{ssh_public_key}"
+    write-append /root/.ssh/authorized_keys \"\\n\"
+    chmod 0700 /root/.ssh
+__EOF__
+
+[ $? -eq 0 ] || { echo 'Error: unable to inject keys into the image #{disk_path}'; exit 1; }
+
+#Extra magic if selinux is enabled
+if [ -n "#{selinux_enabled}" ]; then
+    #{sudo} guestfish #{guestfs_selinux_arg} -a #{disk_path} -i  <<- __EOF__
+        sh 'load_policy -i'
+        sh 'chcon unconfined_u:object_r:user_home_t:s0 /root/.ssh'
+        sh 'chcon system_u:object_r:ssh_home_t /root/.ssh/authorized_keys'
+__EOF__
+    [ $? -eq 0 ] || { echo 'Error: unable to perform selinux operations on #{disk_path}'; exit 1; }
 fi
 
 #{sudo} virsh --connect=qemu:///system setmaxmem #{domain_name} #{instance_memory}
@@ -368,12 +366,12 @@ fi
 
     }
     retval=$?
-    if not retval.success? 
+    if not retval.success?
       puts out
       raise KytoonException, "Failed to create instance #{inst_name}."
     end
 
-    # lookup server IP here... 
+    # lookup server IP here...
     mac_addr = nil
     network_name = nil
     dom_xml = %x{#{sudo} virsh --connect=qemu:///system dumpxml #{domain_name}}
@@ -419,7 +417,7 @@ fi
     }
     puts out
     retval=$?
-    if not retval.success? 
+    if not retval.success?
       puts out
       raise KytoonException, "Failed to cleanup instances."
     end

data/lib/kytoon/thor_tasks.rb

@@ -7,6 +7,8 @@ class ThorTasks < Thor
   desc "create", "Create a new server group."
   method_options :group_type => :string
   method_options :group_config => :string
+
+
   def create(options=(options or {}))
     begin
       ServerGroup.init(options[:group_type])
@@ -14,9 +16,11 @@ class ThorTasks < Thor
       puts "Server group ID #{sg.id} created."
     rescue KytoonException => ke
       puts ke.message
+      exit 1
     end
   end
 
+
   desc "list", "List existing server groups."
   method_options :group_type => :string
   def list(options=(options or {}))
@@ -25,6 +29,7 @@ class ThorTasks < Thor
       ServerGroup.index()
     rescue KytoonException => ke
       puts ke.message
+      exit 1
     end
   end
 
@@ -38,6 +43,7 @@ class ThorTasks < Thor
       sg.pretty_print
     rescue KytoonException => ke
       puts ke.message
+      exit 1
     end
   end
 
@@ -52,6 +58,7 @@ class ThorTasks < Thor
       SshUtil.remove_known_hosts_ip(sg.gateway_ip)
     rescue KytoonException => ke
       puts ke.message
+      exit 1
     end
   end
 
@@ -65,13 +72,14 @@ class ThorTasks < Thor
       puts sg.gateway_ip
     rescue KytoonException => ke
       puts ke.message
+      exit 1
     end
   end
 
   desc "ssh", "SSH into a group."
   method_options :group_id => :string
   method_options :group_type => :string
-  def ssh(options=(options or {}))
+  def ssh(*)
     begin
       ServerGroup.init(options[:group_type])
       args=ARGV[1, ARGV.length].join(" ")
@@ -84,6 +92,7 @@ class ThorTasks < Thor
       exec("ssh -o \"StrictHostKeyChecking no\" root@#{sg.gateway_ip} #{args}")
     rescue KytoonException => ke
       puts ke.message
+      exit 1
     end
   end
 

data/lib/kytoon/util.rb

@@ -47,7 +47,7 @@ module Util
     elsif File.exists?(File.join(ssh_dir, "id_dsa.pub"))
       File.join(ssh_dir, "id_dsa.pub")
     else
-      raise ConfigException, "Failed to load SSH key. Please create a SSH public key pair in your HOME directory."
+      raise ConfigException, "Failed to load SSH key. Please run 'ssh-keygen'."
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kytoon
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-13 00:00:00.000000000 Z
+date: 2013-03-04 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: -1487060926017859322
+      hash: 3688137143086163860
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: