ucloudstack 0.0.1 → 0.0.2

data/CHANGES.rdoc

@@ -1,5 +1,12 @@
 = Changes
 
+== 2012-09-20
+* change name ucloudstack because original modified for adopting KT ucloud
+* https support added
+* template list command added
+* server create modified
+
+
 == 2012-05-17 (0.0.12)
 * Adding option to disable public IP allocation on server create
   https://github.com/CloudStack/knife-cloudstack/pull/8

data/lib/chef/knife/cs_product_list.rb

@@ -58,7 +58,8 @@ module KnifeCloudstack
           product_list << product['zoneid']
           product_list << product['zonedesc']
       end
-      puts ui.list(product_list, :columns_across, 9)
+      #puts ui.list(product_list, :columns_across, 9)
+      puts products.to_json
     end
 
     def locate_config_value(key)

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 = 3
+    BOOTSTRAP_DELAY = 5.0
 
     # Seconds to wait between ssh pings
     SSH_POLL_INTERVAL = 2
@@ -57,6 +57,12 @@ module KnifeCloudstack
            :long => "--zone ZONE",
            :description => "The CloudStack zone for the server",
            :proc => Proc.new { |z| Chef::Config[:knife][:cloudstack_zone] = z }
+  
+    option :cloudstack_disk,
+           :short => "-D DISK",
+           :long => "--disk DISK",
+           :description => "The CloudStack disk for the server",
+           :proc => Proc.new { |i| Chef::Config[:knife][:cloudstack_disk] = i }
 
     option :cloudstack_networks,
            :short => "-W NETWORKS",
@@ -68,7 +74,6 @@ 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,
@@ -145,10 +150,9 @@ module KnifeCloudstack
            :default => false
 
     option :no_bootstrap,
-           :long => "--no-bootstrap",
+           :long => "--[no-]bootstrap",
            :description => "Disable Chef bootstrap",
-           :boolean => true,
-           :default => false
+           :default => true
 
     option :port_rules,
            :short => "-p PORT_RULES",
@@ -182,34 +186,43 @@ module KnifeCloudstack
           locate_config_value(:cloudstack_service),
           locate_config_value(:cloudstack_template),
           locate_config_value(:cloudstack_zone),
+          locate_config_value(:cloudstack_disk),
           locate_config_value(:cloudstack_networks)
       )
+      
+#puts "#"*100
+#puts server
+#puts "#"*100
 
-      public_ip = find_or_create_public_ip(server, connection)
+      private_ip = find_or_create_public_ip(server, connection)
 
       puts "\n\n"
       puts "#{ui.color("Name", :cyan)}: #{server['name']}"
-      puts "#{ui.color("Public IP", :cyan)}: #{public_ip}"
+      puts "#{ui.color("Private IP", :cyan)}: #{private_ip}"
 
-      return if config[:no_bootstrap]
 
       print "\n#{ui.color("Waiting for sshd", :magenta)}"
 
-      print(".") until is_ssh_open?(public_ip) {
+      print(".") until is_ssh_open?(private_ip) {
         sleep BOOTSTRAP_DELAY
         puts "\n"
       }
 
-config[:ssh_password] = server['password']
+      server_info = { 'hostname' => hostname, 'private_ip' => private_ip, 'password' => server['password'] }
+      puts "\n"
+   
+      puts "server_info :"+server_info.to_json+"\n"
 
-      bootstrap_for_node(public_ip).run
+      return unless config[:no_bootstrap]
+        
+      config[:ssh_password] = server['password']
+      bootstrap_for_node(private_ip).run
 
       puts "\n"
       puts "#{ui.color("Name", :cyan)}: #{server['name']}"
-      puts "#{ui.color("Public IP", :cyan)}: #{public_ip}"
+      puts "#{ui.color("Public IP", :cyan)}: #{private_ip}"
       puts "#{ui.color("Environment", :cyan)}: #{config[:environment] || '_default'}"
       puts "#{ui.color("Run List", :cyan)}: #{config[:run_list].join(', ')}"
-
     end
 
     def validate_options
@@ -227,10 +240,10 @@ config[:ssh_password] = server['password']
       identity_file = locate_config_value :identity_file
       ssh_user = locate_config_value :ssh_user
       ssh_password = locate_config_value :ssh_password
-      unless identity_file || (ssh_user && ssh_password)
-        ui.error("You must specify either an ssh identity file or an ssh user and password")
+      #unless identity_file || (ssh_user && ssh_password)
+      #  ui.error("You must specify either an ssh identity file or an ssh user and password")
         #exit 1
-      end
+      #end
     end
 
 

data/lib/chef/knife/cs_template_list.rb

@@ -71,7 +71,9 @@ module KnifeCloudstack
 
       filter = config[:filter]
       templates = connection.list_templates(filter)
+      
       templates.each do |t|
+      puts t
         template_list << t['name']
         template_list << (human_file_size(t['size']) || 'Unknown')
         template_list << t['zonename']

data/lib/knife-cloudstack/connection.rb

@@ -110,8 +110,8 @@ module CloudstackClient
     ##
     # Deploys a new server using the specified parameters.
 
-    def create_server(host_name, service_name, template_name, zone_name=nil, network_names=[])
-
+    def create_server(host_name, service_name, template_name, zone_name, disk_name, network_names=[])
+      
       if host_name then
         if get_server(host_name) then
           puts "Error: Server '#{host_name}' already exists."
@@ -164,8 +164,9 @@ module CloudstackClient
           #'serviceOfferingId' => service['id'],
           'templateId' => template_name,
           #'templateId' => template['id'],
-          'zoneId' => zone_name
+          'zoneId' => zone_name,
           #'zoneId' => zone['id'],
+          'diskofferingid' => disk_name
           #'networkids' => network_ids.join(',')
       }
       params['name'] = host_name if host_name
@@ -555,7 +556,7 @@ 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
@@ -598,17 +599,18 @@ module CloudstackClient
     def send_async_request(params)
 
       json = send_request(params)
-#puts json
+      
       params = {
           'command' => 'queryAsyncJobResult',
           'jobId' => json['jobid']
       }
 
       max_tries = (ASYNC_TIMEOUT / ASYNC_POLL_INTERVAL).round
+      sleep 5 
       max_tries.times do
         json = send_request(params)
         status = json['jobstatus']
-#puts json
+        
         print "."
 
         if status == 1 then

metadata

@@ -2,7 +2,7 @@
 name: ucloudstack
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Ryan Holmes
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-20 00:00:00 Z
+date: 2012-09-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: chef
@@ -88,3 +88,4 @@ specification_version: 3
 summary: A knife plugin for the ucloud API
 test_files: []
 
+has_rdoc: true