kytoon 1.2.4 → 1.2.5

data/CHANGELOG

@@ -1,3 +1,13 @@
+* Mon Nov 26 2012 Dan Prince <dprince@redhat.com> - 1.2.5
+  - Libvirt: ping test instances to ensure they have IPs before
+    trying to configure hosts, etc.
+  - Generate server group IDs with using Time.now.to_f
+    which gives us millisecond accuracy. This should avoid ID
+    collisions which could occur if two groups were spun up
+    in the same second (thus causing image name collisions, etc)
+  - XenServer: Add 'cleanup_before_create' option to run instance
+    cleanup before creating a new group.
+
 * Thu Oct 8 2012 Dan Prince <dprince@redhat.com> - 1.2.4
   - XenServer: Delete VDI's that aren't in use during cleanup.
 

data/VERSION

@@ -1 +1 @@
-1.2.4
+1.2.5

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

@@ -2,6 +2,7 @@ require 'json'
 require 'kytoon/util'
 require 'rexml/document'
 require 'rexml/xpath'
+require 'timeout'
 
 module Kytoon
 
@@ -36,7 +37,7 @@ class ServerGroup
   attr_accessor :use_sudo
 
   def initialize(options={})
-    @id = options[:id] || Time.now.to_i
+    @id = options[:id] || Time.now.to_f
     @name = options[:name]
     @use_sudo = options[:use_sudo]
     @servers=[]
@@ -159,6 +160,7 @@ class ServerGroup
     puts "Copying hosts files..."
     #now that we have IP info copy hosts files into the servers
     sg.servers.each do |server|
+      ping_test(server['ip_address'])
       Kytoon::Util.remote_exec(%{
 cat > /etc/hosts <<-EOF_CAT
 #{hosts_file_data}
@@ -178,6 +180,31 @@ fi
     sg
   end
 
+  def self.default_ip_type()
+    ip_type = Util.load_configs['libvirt_ip_type'] || 4
+    ip_type.to_i
+  end
+
+  def self.ping_test(ip_addr)
+
+    ping_timeout = (Util.load_configs['libvirt_ping_timeout'] || 60).to_i
+
+    begin
+      ping = self.default_ip_type == 6 ? 'ping6' : 'ping'
+      ping_command = "#{ping} -c 1 #{ip_addr} > /dev/null 2>&1"
+      Timeout::timeout(ping_timeout) do
+        while(1) do
+          return true if system(ping_command)
+        end
+      end
+    rescue Timeout::Error => te
+      raise KytoonException, "Timeout pinging server: #{ping_command}"
+    end
+
+    return false
+
+  end
+
   def self.get(options={})
     id = options[:id]
     if id.nil? then

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

@@ -28,7 +28,7 @@ class ServerGroup
   attr_accessor :name
 
   def initialize(options={})
-    @id = options[:id] || Time.now.to_i
+    @id = options[:id] || Time.now.to_f
     @name = options[:name]
     @servers=[]
     end

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

@@ -48,9 +48,10 @@ class ServerGroup
   attr_accessor :bridge
   attr_accessor :public_ip_bridge
   attr_accessor :dns_nameserver
+  attr_accessor :cleanup_before_create
 
   def initialize(options={})
-    @id = options[:id] || Time.now.to_i
+    @id = options[:id] || Time.now.to_f
     @name = options[:name]
     @netmask = options[:netmask]
     @gateway = options[:gateway]
@@ -59,6 +60,7 @@ class ServerGroup
     @bridge = options[:bridge]
     @public_ip_bridge = options[:public_ip_bridge]
     @dns_nameserver = options[:dns_nameserver]
+    @cleanup_before_create = options[:cleanup_before_create]
     @gateway_ip = options[:gateway_ip]
     @gateway_ip = ENV['GATEWAY_IP'] if @gateway_ip.nil?
     raise ConfigException, "Please specify a GATEWAY_IP" if @gateway_ip.nil?
@@ -93,6 +95,7 @@ class ServerGroup
       :dns_nameserver => json_hash['dns_nameserver'],
       :network_type => json_hash['network_type'],
       :public_ip_bridge => json_hash['public_ip_bridge'],
+      :cleanup_before_create => json_hash['cleanup_before_create'],
       :bridge => json_hash['bridge']
     )
     json_hash["servers"].each do |server_hash|
@@ -145,6 +148,7 @@ class ServerGroup
         'gateway_ip' => @gateway_ip,
         'broadcast' => @broadcast,
         'dns_nameserver' => @dns_nameserver,
+        'cleanup_before_create' => @cleanup_before_create,
         'network_type' => @network_type,
         'public_ip_bridge' => @public_ip_bridge,
         'bridge' => @bridge,
@@ -168,6 +172,7 @@ class ServerGroup
   end
 
   def self.create(sg)
+    ServerGroup.cleanup_instances(sg.gateway_ip) if sg.cleanup_before_create
     sg.cache_to_disk
     init_host(sg)
     status, host_ssh_public_key = Kytoon::Util.remote_exec(%{

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kytoon
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-08 00:00:00.000000000 Z
+date: 2012-11-26 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: 1786306078727391994
+      hash: 1238263257557128483
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: