ucloudstack 0.0.2 → 0.0.3

data/README.rdoc

@@ -195,7 +195,7 @@ Reboots the specified virtual machines(s).
 == LICENSE:
 
 Author:: Ryan Holmes <rholmes@edmunds.com> 
-Author:: KC Braunschweig <kbraunschweig@edmunds.com>
+Author:: KC Braunschweig <kcbraunschweig@gmail.com>
 Author:: John E. Vincent <lusis.org+github.com@gmail.com>
 
 Copyright:: Copyright (c) 2011 Edmunds, Inc.

data/lib/chef/knife/cs_server_create.rb

@@ -23,7 +23,7 @@ module KnifeCloudstack
   class CsServerCreate < Chef::Knife
 
     # Seconds to delay between detecting ssh and initiating the bootstrap
-    BOOTSTRAP_DELAY = 5.0
+    BOOTSTRAP_DELAY = 3
 
     # Seconds to wait between ssh pings
     SSH_POLL_INTERVAL = 2
@@ -74,6 +74,7 @@ module KnifeCloudstack
     option :public_ip,
            :long => "--[no-]public-ip",
            :description => "Allocate a public IP for this server",
+           :boolean => true,
            :default => true
 
     option :chef_node_name,
@@ -150,7 +151,7 @@ module KnifeCloudstack
            :default => false
 
     option :no_bootstrap,
-           :long => "--[no-]bootstrap",
+           :long => "--no-bootstrap",
            :description => "Disable Chef bootstrap",
            :default => true
 

data/lib/chef/knife/cs_server_list.rb

@@ -60,7 +60,8 @@ module KnifeCloudstack
           ui.color('Public IP', :bold),
           ui.color('Service', :bold),
           ui.color('Template', :bold),
-          ui.color('State', :bold)
+          ui.color('State', :bold),
+          ui.color('Hypervisor', :bold)
       ]
 
       servers = connection.list_servers
@@ -78,8 +79,9 @@ module KnifeCloudstack
         server_list << server['serviceofferingname']
         server_list << server['templatename']
         server_list << server['state']
+        server_list << (server['hostname'] || 'N/A')
       end
-      puts ui.list(server_list, :columns_across, 5)
+      puts ui.list(server_list, :columns_across, 6)
 
     end
 

data/lib/chef/knife/cs_server_reboot.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Ryan Holmes (<rholmes@edmunds.com>)
-# Author:: KC Braunschweig (<kbraunschweig@edmunds.com>)
+# Author:: KC Braunschweig (<kcbraunschweig@gmail.com>)
 # Copyright:: Copyright (c) 2011 Edmunds, Inc.
 # License:: Apache License, Version 2.0
 #

data/lib/chef/knife/cs_server_start.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Ryan Holmes (<rholmes@edmunds.com>)
-# Author:: KC Braunschweig (<kbraunschweig@edmunds.com>)
+# Author:: KC Braunschweig (<kcbraunschweig@gmail.com>)
 # Copyright:: Copyright (c) 2011 Edmunds, Inc.
 # License:: Apache License, Version 2.0
 #

data/lib/chef/knife/cs_server_stop.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Ryan Holmes (<rholmes@edmunds.com>)
-# Author:: KC Braunschweig (<kbraunschweig@edmunds.com>)
+# Author:: KC Braunschweig (<kcbraunschweig@gmail.com>)
 # Copyright:: Copyright (c) 2011 Edmunds, Inc.
 # License:: Apache License, Version 2.0
 #

data/lib/chef/knife/cs_template_list.rb

@@ -62,6 +62,7 @@ module KnifeCloudstack
       )
 
       template_list = [
+          ui.color('ID', :bold),
           ui.color('Name', :bold),
           ui.color('Size', :bold),
           ui.color('Zone', :bold),
@@ -73,14 +74,14 @@ module KnifeCloudstack
       templates = connection.list_templates(filter)
       
       templates.each do |t|
-      puts t
+        template_list << t['id']
         template_list << t['name']
         template_list << (human_file_size(t['size']) || 'Unknown')
         template_list << t['zonename']
         template_list << t['ispublic'].to_s
         template_list << t['created']
       end
-      puts ui.list(template_list, :columns_across, 5)
+      puts ui.list(template_list, :columns_across, 6)
 
     end
 

data/lib/knife-cloudstack/connection.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Ryan Holmes (<rholmes@edmunds.com>)
-# Author:: KC Braunschweig (<kbraunschweig@edmunds.com>)
+# Author:: KC Braunschweig (<kcbraunschweig@gmail.com>)
 # Copyright:: Copyright (c) 2011 Edmunds, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -22,7 +22,6 @@ require 'base64'
 require 'openssl'
 require 'uri'
 require 'cgi'
-require 'net/http'
 require 'net/https'
 require 'json'
 
@@ -556,7 +555,6 @@ module CloudstackClient
     def send_request(params)
       params['response'] = 'json'
       params['apiKey'] = @api_key
-      
       params_arr = []
       params.sort.each { |elem|
         params_arr << elem[0].to_s + '=' + elem[1].to_s

metadata

@@ -2,7 +2,7 @@
 name: ucloudstack
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Ryan Holmes
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-20 00:00:00 Z
+date: 2012-09-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: chef