kytoon 1.3.1 → 1.3.2

data/CHANGELOG

@@ -1,3 +1,8 @@
+* Mon Feb 11 2013 Dan Prince <dprince@redhat.com> - 1.3.2
+  -Add 'selinux_enabled' option for libvirt provider. If set this
+   option will set the SELinux context on /root/.ssh/authorized_keys
+   in the instance thus making it ssh'able when SELinux is enabled.
+
 * 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)

data/README.md

@@ -63,6 +63,8 @@ each server group.  These files typically live inside of project are
 provider specific. The config files control things like memory, hostname,
 flavor, etc. Each group should define identify one instance as the 'gateway' host which marks it as the primary access point for SSH access into the group.
 
+NOTE: As Kytoon relies on SSH access, the base images being used for server groups must have the SSH daemon installed and enabled, as well as reachable. If there is a firewall on the guest images, it must be configured accordingly.
+
 By default Kytoon looks for config/server_group.json in the current directory.
 You can override this with Rake using GROUP_CONFIG or bin/kytoon using --group-config.
 
@@ -94,7 +96,10 @@ For Openstack:
 
 For Libvirt (uses libvirt DHCP server for instance IP configuration):
 
+NOTE: Kytoon is always using the qemu:///system Libvirt connection.
 NOTE: Kytoon assumes you are using NAT networking for your libvirt instances. If you use bridged networking the IP discovery mechanism will fail.
+NOTE: If the 'create_cow' option is set to 'true', the format for the disk driver must be 'qcow2' in the original guest image, or guest xml (and not 'raw', for instance). The original guest xml might need to be adjusted for this.
+NOTE: You can dump the xml for the original guest image with the 'virsh --connect=qemu:///system dumpxml $DOMAIN' command.
 
 ```bash
 

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.3.2

data/config/server_group_libvirt.json

@@ -5,14 +5,16 @@
             "hostname": "nova1",
             "memory": "1",
             "original_xml": "/home/dprince/f17.xml",
-            "create_cow": "true"
+            "create_cow": "true",
+            "selinux_enabled": "false"
         },
         {
             "hostname": "login",
             "memory": "1",
             "gateway": "true",
             "original_xml": "/home/dprince/f17.xml",
-            "create_cow": "true"
+            "create_cow": "true",
+            "selinux_enabled": "false"
         }
 
     ]

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

@@ -76,6 +76,7 @@ class ServerGroup
         'original' => server_hash['original'],
         'original_xml' => server_hash['original_xml'],
         'create_cow' => server_hash['create_cow'],
+        'selinux_enabled' => server_hash['selinux_enabled'],
         'disk_path' => server_hash['disk_path'],
         'ip_address' => server_hash['ip_address'],
         'gateway' => server_hash['gateway'] || "false"
@@ -121,7 +122,7 @@ class ServerGroup
         'servers' => []
     }
     @servers.each do |server|
-        sg_hash['servers'] << {'hostname' => server['hostname'], 'memory' => server['memory'], 'gateway' => server['gateway'], 'original' => server['original'], 'original_xml' => server['original_xml'], 'create_cow' => server['create_cow'], 'disk_path' => server['disk_path'], 'ip_address' => server['ip_address']}
+        sg_hash['servers'] << {'hostname' => server['hostname'], 'memory' => server['memory'], 'gateway' => server['gateway'], 'original' => server['original'], 'original_xml' => server['original_xml'], 'create_cow' => server['create_cow'], 'disk_path' => server['disk_path'], 'selinux_enabled' => server['selinux_enabled'], 'ip_address' => server['ip_address']}
     end
 
     FileUtils.mkdir_p(@@data_dir)
@@ -165,7 +166,7 @@ class ServerGroup
       disk_path=File.join(image_dir, "#{sg.id}_#{server['hostname']}.img")
       server['disk_path'] = disk_path
 
-      instance_ip = create_instance(sg.id, server['hostname'], server['memory'], server['original'], server['original_xml'], disk_path, server['create_cow'], ssh_public_key, sudo)
+      instance_ip = create_instance(sg.id, server['hostname'], server['memory'], server['original'], server['original_xml'], disk_path, server['create_cow'], server['selinux_enabled'], ssh_public_key, sudo)
       server['ip_address'] = instance_ip
       hosts_file_data += "#{instance_ip}\t#{server['hostname']}\n"
       sg.cache_to_disk
@@ -294,7 +295,9 @@ fi
     raise KytoonException, "Unable to find disk path for instance."
   end
 
-  def self.create_instance(group_id, inst_name, memory_gigs, original, original_xml, disk_path, create_cow, ssh_public_key, sudo)
+  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" : ""
 
     puts "Creating instance: #{inst_name}"
     instance_memory = (KIB_PER_GIG * memory_gigs.to_f).to_i
@@ -305,7 +308,6 @@ fi
 if [ -n "$DEBUG" ]; then
 set -x
 fi
-export VIRSH_DEFAULT_CONNECT_URI="qemu:///system"
 if [ -n "#{original_xml}" ]; then
   ORIGIN="--original-xml #{original_xml}"
 elif [ -n "#{original}" ]; then
@@ -316,7 +318,7 @@ fi
 
 if [ -n "#{create_cow}" ]; then
 
-  #{sudo} virt-clone --connect="$VIRSH_DEFAULT_CONNECT_URI" \
+  #{sudo} virt-clone --connect=qemu:///system \
     --name '#{domain_name}' \
     --file '#{disk_path}' \
     --force \
@@ -328,7 +330,7 @@ if [ -n "#{create_cow}" ]; then
 
 else
 
-  #{sudo} virt-clone --connect="$VIRSH_DEFAULT_CONNECT_URI" \
+  #{sudo} virt-clone --connect=qemu:///system \
     --name '#{domain_name}' \
     --file '#{disk_path}' \
     --force \
@@ -340,17 +342,28 @@ 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
-  #{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"
+  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 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
 fi
 
-#{sudo} virsh setmaxmem #{domain_name} #{instance_memory}
-#{sudo} virsh start #{domain_name}
-#{sudo} virsh setmem #{domain_name} #{instance_memory}
+#{sudo} virsh --connect=qemu:///system setmaxmem #{domain_name} #{instance_memory}
+#{sudo} virsh --connect=qemu:///system start #{domain_name}
+#{sudo} virsh --connect=qemu:///system setmem #{domain_name} #{instance_memory}
 
     }
     retval=$?
@@ -393,13 +406,12 @@ fi
 if [ -n "$DEBUG" ]; then
 set -x
 fi
-export VIRSH_DEFAULT_CONNECT_URI="qemu:///system"
-if #{sudo} virsh dumpxml #{domain_name} &> /dev/null; then
-  #{sudo} virsh destroy "#{domain_name}" &> /dev/null
-  #{sudo} virsh undefine "#{domain_name}"
+if #{sudo} virsh --connect=qemu:///system dumpxml #{domain_name} &> /dev/null; then
+  #{sudo} virsh --connect=qemu:///system destroy "#{domain_name}" &> /dev/null
+  #{sudo} virsh --connect=qemu:///system undefine "#{domain_name}"
 fi
 # If we used --preserve-data there will be no volume... ignore it
-#{sudo} virsh vol-delete --pool default "#{group_id}_#{inst_name}.img" &> /dev/null
+#{sudo} virsh --connect=qemu:///system vol-delete --pool default "#{group_id}_#{inst_name}.img" &> /dev/null
 if [ -f "#{disk_path}" ]; then
   #{sudo} rm -f "#{disk_path}"
 fi

metadata

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