kytoon 1.1.0 → 1.1.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+* Thu Aug 23 2012 Dan Prince <dprince@redhat.com> - 1.1.1
+  - Add 'libvirt_use_sudo' option to config file.
+  - Move config parameter checks into specific providers.
+
 * Wed Aug 22 2012 Dan Prince <dprince@redhat.com> - 1.1.0
   - Add local libvirt provider based on virt-clone.
   - Libvirt: Support creating qcow2 disks during group creation.

data/README.rdoc

@@ -12,7 +12,7 @@ Inspired by and based on the Chef VPC Toolkit.
 
 - Libvirt: manage instances on local machine w/ libvirt, virt-clone, and libguestfs
 - XenServer: manage instances on a remote XenServer box (via ssh)
-- Cloud Servers VPC: API driven. Supports Rackspace and OpenStack
+- Cloud Servers VPC: API driven. Supports Rackspace Cloud and OpenStack.
 
 == Installation
 
@@ -27,10 +27,23 @@ Inspired by and based on the Chef VPC Toolkit.
 
 3) Create a .kytoon.conf file in your HOME directory that contains the following:
 
-	# Set one of the following group_types
+For libvirt:
+
+	# The default group type. Override with GROUP_TYPE
 	group_type: libvirt
-	#group_type: xenserver
-	#group_type: cloud_server_vpc
+
+	# Whether commands to create local group should use sudo
+	libvirt_use_sudo: False
+
+For XenServer:
+
+	# The default group type. Override with GROUP_TYPE
+	group_type: xenserver
+
+For Cloud Servers VPC:
+
+	# The default group type. Override with GROUP_TYPE
+	group_type: cloud_servers_vpc
 
 	# Cloud Servers VPC credentials
 	cloud_servers_vpc_url: https://your.vpc.url/

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/kytoon/providers/cloud_servers_vpc.rb

@@ -4,3 +4,8 @@ require 'kytoon/providers/cloud_servers_vpc/server'
 require 'kytoon/providers/cloud_servers_vpc/server_group'
 require 'kytoon/providers/cloud_servers_vpc/ssh_public_key'
 require 'kytoon/providers/cloud_servers_vpc/vpn_network_interface'
+require 'kytoon/util'
+
+Kytoon::Util.check_config_param('cloud_servers_vpc_url')
+Kytoon::Util.check_config_param('cloud_servers_vpc_username')
+Kytoon::Util.check_config_param('cloud_servers_vpc_password')

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

@@ -33,10 +33,12 @@ class ServerGroup
 
   attr_accessor :id
   attr_accessor :name
+  attr_accessor :use_sudo
 
   def initialize(options={})
     @id = options[:id] || Time.now.to_i
     @name = options[:name]
+    @use_sudo = options[:use_sudo]
     @servers=[]
     end
 
@@ -57,9 +59,13 @@ class ServerGroup
 
     json_hash=JSON.parse(json)
 
+    configs = Util.load_configs
+    use_sudo = ENV['LIBVIRT_USE_SUDO'] || configs['libvirt_use_sudo']
+
     sg=ServerGroup.new(
       :id => json_hash["id"],
-      :name => json_hash["name"]
+      :name => json_hash["name"],
+      :use_sudo => use_sudo
     )
     json_hash["servers"].each do |server_hash|
 
@@ -125,16 +131,18 @@ class ServerGroup
   end
 
   def delete
+    sudo = @use_sudo =~ /(true|t|yes|y|1)$/i ? "sudo" : ""
     servers.each do |server|
-      ServerGroup.cleanup_instances(@id, server['hostname'], server['disk_path'])
+      ServerGroup.cleanup_instances(@id, server['hostname'], server['disk_path'], sudo)
     end
     out_file=File.join(@@data_dir, "#{@id}.json")
     File.delete(out_file) if File.exists?(out_file)
   end
 
   def self.create(sg)
-    ssh_public_key = Kytoon::Util.load_public_key
 
+    ssh_public_key = Kytoon::Util.load_public_key
+    sudo = sg.use_sudo =~ /(true|t|yes|y|1)$/i ? "sudo" : ""
     hosts_file_data = "127.0.0.1\tlocalhost localhost.localdomain\n"
     sg.servers.each do |server|
 
@@ -142,7 +150,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)
+      instance_ip = create_instance(sg.id, server['hostname'], server['memory'], server['original'], server['original_xml'], disk_path, server['create_cow'], ssh_public_key, sudo)
       server['ip_address'] = instance_ip
       hosts_file_data += "#{instance_ip}\t#{server['hostname']}\n"
       sg.cache_to_disk
@@ -218,7 +226,7 @@ fi
     raise "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)
+  def self.create_instance(group_id, inst_name, memory_gigs, original, original_xml, disk_path, create_cow, ssh_public_key, sudo)
 
     puts "Creating instance: #{inst_name}"
     instance_memory = (KIB_PER_GIG * memory_gigs.to_f).to_i
@@ -240,7 +248,7 @@ fi
 
 if [ -n "#{create_cow}" ]; then
 
-  virt-clone --connect="$VIRSH_DEFAULT_CONNECT_URI" \
+  #{sudo} virt-clone --connect="$VIRSH_DEFAULT_CONNECT_URI" \
     --name '#{domain_name}' \
     --file '#{disk_path}' \
     --force \
@@ -248,11 +256,11 @@ if [ -n "#{create_cow}" ]; then
     --preserve-data \
     || { echo "failed to virt-clone"; exit 1; }
 
-  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}"
 
 else
 
-  virt-clone --connect="$VIRSH_DEFAULT_CONNECT_URI" \
+  #{sudo} virt-clone --connect="$VIRSH_DEFAULT_CONNECT_URI" \
     --name '#{domain_name}' \
     --file '#{disk_path}' \
     --force \
@@ -261,10 +269,10 @@ else
 
 fi
 
-LV_ROOT=$(virt-filesystems -a #{disk_path} --logical-volumes | grep root)
+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
-  guestfish --selinux add #{disk_path} : \
+  #{sudo} guestfish --selinux add #{disk_path} : \
     run : \
     mount $LV_ROOT / : \
     sh "/bin/mkdir -p /root/.ssh" : \
@@ -272,9 +280,9 @@ if [ -n "$LV_ROOT" ]; then
     sh "/bin/chmod -R 700 /root/.ssh"
 fi
 
-virsh setmaxmem #{domain_name} #{instance_memory}
-virsh start #{domain_name}
-virsh setmem #{domain_name} #{instance_memory}
+#{sudo} virsh setmaxmem #{domain_name} #{instance_memory}
+#{sudo} virsh start #{domain_name}
+#{sudo} virsh setmem #{domain_name} #{instance_memory}
 
     }
     retval=$?
@@ -285,7 +293,7 @@ virsh setmem #{domain_name} #{instance_memory}
 
     # lookup server IP here... 
     mac_addr = nil
-    dom_xml = %x{virsh --connect=qemu:///system dumpxml #{domain_name}}
+    dom_xml = %x{#{sudo} virsh --connect=qemu:///system dumpxml #{domain_name}}
     dom = REXML::Document.new(dom_xml)
     REXML::XPath.each(dom, "//interface/mac") do |interface_xml|
       mac_addr = interface_xml.attributes['address']
@@ -306,21 +314,21 @@ virsh setmem #{domain_name} #{instance_memory}
 
   end
 
-  def self.cleanup_instances(group_id, inst_name, disk_path)
+  def self.cleanup_instances(group_id, inst_name, disk_path, sudo)
     domain_name="#{group_id}_#{inst_name}"
     out = %x{
 if [ -n "$DEBUG" ]; then
 set -x
 fi
 export VIRSH_DEFAULT_CONNECT_URI="qemu:///system"
-if virsh dumpxml #{domain_name} &> /dev/null; then
-  virsh destroy "#{domain_name}" &> /dev/null
-  virsh undefine "#{domain_name}"
+if #{sudo} virsh dumpxml #{domain_name} &> /dev/null; then
+  #{sudo} virsh destroy "#{domain_name}" &> /dev/null
+  #{sudo} virsh undefine "#{domain_name}"
 fi
 # If we used --preserve-data there will be no volume... ignore it
-virsh vol-delete --pool default "#{group_id}_#{inst_name}.img" &> /dev/null
+#{sudo} virsh vol-delete --pool default "#{group_id}_#{inst_name}.img" &> /dev/null
 if [ -f "#{disk_path}" ]; then
-  rm -f "#{disk_path}"
+  #{sudo} rm -f "#{disk_path}"
 fi
     }
     puts out

data/lib/kytoon/server_group.rb

@@ -1,7 +1,3 @@
-require 'kytoon/providers/cloud_servers_vpc'
-require 'kytoon/providers/libvirt'
-require 'kytoon/providers/xenserver'
-
 class ServerGroup
 
   @@group_class = nil
@@ -12,10 +8,13 @@ class ServerGroup
     configs = Util.load_configs
     group_type = ENV['GROUP_TYPE'] || configs['group_type']
     if group_type == "cloud_server_vpc" then
+        require 'kytoon/providers/cloud_servers_vpc'
         @@group_class = Kytoon::Providers::CloudServersVPC::ServerGroup
     elsif group_type == "xenserver" then
+        require 'kytoon/providers/xenserver'
         @@group_class = Kytoon::Providers::Xenserver::ServerGroup
     elsif group_type == "libvirt" then
+        require 'kytoon/providers/libvirt'
         @@group_class = Kytoon::Providers::Libvirt::ServerGroup
     else
         raise "Invalid 'group_type' specified in config file."

data/lib/kytoon/util.rb

@@ -30,9 +30,6 @@ module Util
 
     if File.exists?(config_file) then
       configs=YAML.load_file(config_file)
-      raise_if_nil_or_empty(configs, "cloud_servers_vpc_url")
-      raise_if_nil_or_empty(configs, "cloud_servers_vpc_username")
-      raise_if_nil_or_empty(configs, "cloud_servers_vpc_password")
       @@configs=configs
     else
       raise "Failed to load kytoon config file. Please configure /etc/kytoon.conf or create a .kytoon.conf config file in your HOME directory."
@@ -57,9 +54,10 @@ module Util
 
   end
 
-  def self.raise_if_nil_or_empty(options, key)
-    if not options or options[key].nil? or options[key].empty? then
-      raise "Please specify a valid #{key.to_s} parameter."
+  def self.check_config_param(key)
+    configs = load_configs
+    if not configs or configs[key].nil? or configs[key].empty? then
+      raise "Please specify '#{key.to_s}' in your kytoon config file."
     end
   end
 

data/test/client_test.rb

@@ -1,5 +1,6 @@
 $:.unshift File.dirname(__FILE__)
 require 'test_helper'
+require 'kytoon/providers/cloud_servers_vpc'
 
 module Kytoon
 module Providers

data/test/vpn_network_manager_test.rb

@@ -2,6 +2,7 @@ $:.unshift File.dirname(__FILE__)
 require 'test_helper'
 
 require 'tempfile'
+require 'kytoon/providers/cloud_servers_vpc'
 
 module Kytoon
 module Vpn

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kytoon
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-22 00:00:00.000000000 Z
+date: 2012-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -235,7 +235,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -990140921897305519
+      hash: -1959876688659758005
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: