knife-clodo 0.1.3 → 0.1.4

data/knife-clodo.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |spec|
   spec.name = 'knife-clodo'
-  spec.version = '0.1.3'
+  spec.version = '0.1.4'
   spec.summary = 'Clodo.Ru knife plugin'
-  spec.add_dependency('fog', '>= 0.10.0')
+  spec.add_dependency('fog', '>= 0.11.0')
   spec.description = <<-EOF
 	Knife plugin for Clodo.Ru cloud provider.
 EOF

data/lib/chef/knife/bootstrap/debian6apt.erb

@@ -1,7 +1,7 @@
 bash -c '
 <%= "export http_proxy=\"#{knife_config[:bootstrap_proxy]}\"" if knife_config[:bootstrap_proxy] -%>
 
-while [ -e /var/adm/autoinstall/init.d/* ] do
+while [ -d /var/adm/autoinstall/init.d -a -e /var/adm/autoinstall/init.d/* ] do
 	echo "Autoinstallation still in progress. Waiting 5sec...";
 	sleep 5;
 done

data/lib/chef/knife/clodo_base.rb

@@ -18,44 +18,30 @@ class Chef
           option :clodo_api_key,
           :short => "-K KEY",
           :long => "--clodo-api-key KEY",
-          :description => "Your clodo.ru API key",
-          :proc => Proc.new { |key| Chef::Config[:knife][:clodo_api_key] = key }
+          :description => "Your clodo.ru API key"
 
           option :clodo_username,
           :short => "-A USERNAME",
           :long => "--clodo-username USERNAME",
-          :description => "Your clodo.ru API username",
-          :proc => Proc.new { |username| Chef::Config[:knife][:clodo_username] = username }
+          :description => "Your clodo.ru API username"
 
           option :clodo_api_auth_url,
           :long => "--clodo-api-auth-url URL",
-          :description => "Your clodo.ru API auth url",
-          :default => "api.clodo.ru",
-          :proc => Proc.new { |url| Chef::Config[:knife][:clodo_api_auth_url] = url }
+          :description => "Your clodo.ru API auth url"
         end
 
         def connection
           @connection ||= Fog::Compute::Clodo.new({
-                                                    :clodo_api_key => Chef::Config[:knife][:clodo_api_key],
-                                                    :clodo_username => (Chef::Config[:knife][:clodo_username] || Chef::Config[:knife][:clodo_api_username]),
-                                                    :clodo_auth_url => Chef::Config[:knife][:clodo_api_auth_url] || config[:clodo_api_auth_url]})
+                                                    :clodo_api_key  => locate_config_value(:clodo_api_key),
+                                                    :clodo_username => locate_config_value(:clodo_username),
+                                                    :clodo_auth_url => locate_config_value(:clodo_api_auth_url) || 'api.clodo.ru'})
         end
 
         def locate_config_value(key)
           key = key.to_sym
-          Chef::Config[:knife][key] || config[key]
+          config[key] || Chef::Config[:knife][key]
         end
-
-        def public_dns_name(server)
-          @public_dns_name ||= begin
-                                 Resolv.getname(server.public_ip_address)
-                               rescue
-                                 "#{server.public_ip_address.gsub('.','-')}.clodo.ru"
-                               end
-        end
-
       end
-
     end
   end
 end

data/lib/chef/knife/clodo_server_create.rb

@@ -84,8 +84,7 @@ class Chef
 
       option :bootstrap_version,
       :long => "--bootstrap-version VERSION",
-      :description => "The version of Chef to install",
-      :proc => Proc.new { |v| Chef::Config[:knife][:bootstrap_version] = v }
+      :description => "The version of Chef to install"
 
       option :bootstrap_delay,
       :long => "--bootstrap-delay SEC",
@@ -96,22 +95,14 @@ class Chef
       :long => "--prerelease",
       :description => "Install the pre-release chef gems"
 
-      option :bootstrap_version,
-      :long => "--bootstrap-version VERSION",
-      :description => "The version of Chef to install",
-      :proc => Proc.new { |v| Chef::Config[:knife][:bootstrap_version] = v }
-
       option :distro,
       :short => "-d DISTRO",
       :long => "--distro DISTRO",
-      :description => "Bootstrap a distro using a template; default is 'debian6apt'",
-      :proc => Proc.new { |d| Chef::Config[:knife][:distro] = d },
-      :default => "debian6apt"
+      :description => "Bootstrap a distro using a template; default is 'debian6apt'"
 
       option :template_file,
       :long => "--template-file TEMPLATE",
       :description => "Full path to location of template to use",
-      :proc => Proc.new { |t| Chef::Config[:knife][:template_file] = t },
       :default => false
 
       option :run_list,
@@ -127,7 +118,6 @@ class Chef
         if readable
           Chef::Log.debug("sshd accepting connections on #{hostname}, banner is #{tcp_socket.gets}")
           yield
-          true
         else
           false
         end
@@ -149,21 +139,21 @@ class Chef
       def run
         $stdout.sync = true
 
-        unless Chef::Config[:knife][:image]
+        unless locate_config_value(:image)
           ui.error("You have not provided a valid image value.  Please note the short option for this value recently changed from '-i' to '-I'.")
           exit 1
         end
 
         options = {
-          :vps_type => Chef::Config[:knife][:server_type],
-          :vps_memory => Chef::Config[:knife][:server_memory],
-          :vps_memory_max => Chef::Config[:knife][:server_memory_max],
-          :vps_hdd => Chef::Config[:knife][:server_disk],
-          :vps_admin => Chef::Config[:knife][:server_support_level],
-          :vps_os => Chef::Config[:knife][:image]
+          :vps_type       => locate_config_value(:server_type),
+          :vps_memory     => locate_config_value(:server_memory),
+          :vps_memory_max => locate_config_value(:server_memory_max),
+          :vps_hdd        => locate_config_value(:server_disk),
+          :vps_admin      => locate_config_value(:server_support_level),
+          :vps_os         => locate_config_value(:image)
         }
 
-        options[:name] = config[:server_name] if config[:server_name]
+        options[:vps_title] = config[:server_name] if config[:server_name]
 
         server = connection.servers.create(options)
 
@@ -176,25 +166,28 @@ class Chef
         print "\n#{ui.color("Waiting server", :magenta)}"
 
         # wait for it to be ready to do stuff
-        server.wait_for { print "."; ready? }
+        server.wait_for(600, 10) do print "."; ready? end
 
         puts("\n")
 
-        puts "#{ui.color("Public DNS Name", :cyan)}: #{public_dns_name(server)}"
         puts "#{ui.color("Public IP Address", :cyan)}: #{server.public_ip_address}"
         puts "#{ui.color("Password", :cyan)}: #{server.password}"
 
         print "\n#{ui.color("Waiting for sshd", :magenta)}"
 
-        print(".") until tcp_test_ssh(server.public_ip_address) { sleep @initial_sleep_delay ||= config[:bootstrap_delay].to_i; puts("done") }
+        print(".") until tcp_test_ssh(server.public_ip_address) { sleep @initial_sleep_delay ||= config[:bootstrap_delay].to_i; true; }
+
+	if File::exists? "#{ENV['HOME']}/.ssh/id_rsa.pub"
+	        server.public_key_path = "#{ENV['HOME']}/.ssh/id_rsa.pub" 
+	        server.setup({:password => server.password})
+	end
 
-        bootstrap_for_node(server).run
+        bootstrap_for_node(server).run if locate_config_value(:distro) || locate_config_value(:template_file)
 
         puts "\n"
         puts "#{ui.color("Instance ID", :cyan)}: #{server.id}"
         puts "#{ui.color("Name", :cyan)}: #{server.name}"
         puts "#{ui.color("Image", :cyan)}: #{server.image}"
-        puts "#{ui.color("Public DNS Name", :cyan)}: #{public_dns_name(server)}"
         puts "#{ui.color("Public IP Address", :cyan)}: #{server.public_ip_address}"
         puts "#{ui.color("Password", :cyan)}: #{server.password}"
         puts "#{ui.color("Environment", :cyan)}: #{config[:environment] || '_default'}"
@@ -203,7 +196,7 @@ class Chef
 
       def bootstrap_for_node(server)
         bootstrap = Chef::Knife::Bootstrap.new
-        bootstrap.name_args = [public_dns_name(server)]
+        bootstrap.name_args = [server.public_ip_address]
         bootstrap.config[:run_list] = config[:run_list]
         bootstrap.config[:ssh_user] = config[:ssh_user] || "root"
         bootstrap.config[:ssh_password] = server.password
@@ -213,7 +206,9 @@ class Chef
         bootstrap.config[:bootstrap_version] = locate_config_value(:bootstrap_version)
         # bootstrap will run as root...sudo (by default) also messes up Ohai on CentOS boxes
         bootstrap.config[:use_sudo] = true unless config[:ssh_user] == 'root'
-        bootstrap.config[:environment] = config[:environment]
+        bootstrap.config[:environment] = locate_config_value(:environment)
+        bootstrap.config[:distro] = locate_config_value(:distro)
+        bootstrap.config[:template_file] = locate_config_value(:template_file)
         bootstrap
       end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: knife-clodo
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Stepan G. Fedorov
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-06 00:00:00 +04:00
-default_executable: 
+date: 2011-10-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fog
@@ -26,12 +25,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 55
+        hash: 51
         segments: 
         - 0
-        - 10
+        - 11
         - 0
-        version: 0.10.0
+        version: 0.11.0
   type: :runtime
   version_requirements: *id001
 description: "\tKnife plugin for Clodo.Ru cloud provider.\n"
@@ -54,7 +53,6 @@ files:
 - lib/chef/knife/clodo_server_reboot.rb
 - lib/chef/knife/clodo_server_start.rb
 - lib/chef/knife/clodo_server_stop.rb
-has_rdoc: true
 homepage: http://clodo.ru/
 licenses: []
 
@@ -84,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Clodo.Ru knife plugin