kytoon 1.4.2 → 1.4.3

data/CHANGELOG

@@ -1,3 +1,6 @@
+* Wed Aug 21 2013 Dan Prince <dprince@redhat.com> - 1.4.3
+  -CloudCue: Add support for image_name.
+
 * Tue Aug 20 2013 Dan Prince <dprince@redhat.com> - 1.4.2
   -Add --remote option to be used when listing remote CloudCue
    groups.

data/VERSION

@@ -1 +1 @@
-1.4.2
+1.4.3

data/lib/kytoon/providers/cloud_cue/server.rb

@@ -14,6 +14,7 @@ class Server
   attr_accessor :cloud_server_id_number
   attr_accessor :flavor_id
   attr_accessor :image_id
+  attr_accessor :image_name
   attr_accessor :server_group_id
   attr_accessor :gateway
   attr_accessor :retry_count
@@ -30,6 +31,7 @@ class Server
     @cloud_server_id_number=options[:cloud_server_id_number]
     @flavor_id=options[:flavor_id]
     @image_id=options[:image_id]
+    @image_name=options[:image_name]
     @admin_password=options[:admin_password]
     @server_group_id=options[:server_group_id].to_i
     @gateway = [true, "true"].include?(options[:gateway])
@@ -54,7 +56,12 @@ class Server
       server.tag! "internal-ip-addr", @internal_ip_addr if @internal_ip_addr
       server.tag! "cloud-server-id-number", @cloud_server_id_number if @cloud_server_id_number
       server.tag! "flavor-id", @flavor_id
-      server.tag! "image-id", @image_id
+      if @image_id then
+        server.tag! "image-id", @image_id
+      end
+      if @image_name then
+        server.tag! "image-name", @image_name
+      end
       server.tag! "admin-password", @admin_password
       server.tag! "server-group-id", @server_group_id
       server.tag! "gateway", "true" if gateway?

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

@@ -75,6 +75,7 @@ class ServerGroup
         :description => server_config["description"],
         :flavor_id => server_config["flavor_id"],
         :image_id => server_config["image_id"],
+        :image_name => server_config["image_name"],
         :gateway => server_config["gateway"]
       )
     end
@@ -105,7 +106,12 @@ class ServerGroup
             xml_server.name(server.name)
             xml_server.description(server.description)
             xml_server.tag! "flavor-id", server.flavor_id
-            xml_server.tag! "image-id", server.image_id
+            if server.image_id then
+              xml_server.tag! "image-id", server.image_id
+            end
+            if server.image_name then
+              xml_server.tag! "image-name", server.image_name
+            end
             if server.admin_password then
               xml_server.tag! "admin-password", server.admin_password
             end

data/lib/kytoon/thor_tasks.rb

@@ -89,11 +89,6 @@ class ThorTasks < Thor
       ServerGroup.init(options[:group_type])
       args=ARGV[1, ARGV.length].join(" ")
       sg = ServerGroup.get(options[:group_id], {:remote => options[:remote]})
-      #if (ARGV[1] and ARGV[1] =~ /^--group_id.*/) and (ARGV[2] and ARGV[2] =~ /^--group_id.*/)
-        #args=ARGV[3, ARGV.length].join(" ")
-      #elsif ARGV[1] and ARGV[1] =~ /^--group_id.*/
-        #args=ARGV[2, ARGV.length].join(" ")
-      #end
       arg_count = 1
       arg_count +=1 if args =~ /--group_type/
       arg_count +=1 if args =~ /--group_id/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kytoon
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-20 00:00:00.000000000 Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -283,7 +283,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1893588902202544719
+      hash: -3393092285663010569
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: