knife-rackspace 0.5.14 → 0.5.16

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v0.5.16
+* KNIFE_RACKSPACE-36 Changed to code to use IP address for bootstrapping
+* KNIFE_RACKSPACE-38 Support the -P --purge option
+* Refactored to use msg_pair method like other knife plugins with eye on eventual base class.
+* KNIFE_RACKSPACE-29 Support private network to connect to for bootstrap
+* KNIFE_RACKSPACE-40 Support for disabling host key checking
+* Added the 'unknown' state to `rackspace server list`, appeared transitory
+
 ## v0.5.14
 * KNIFE_RACKSPACE-25 version bump to match knife-ec2's dependencies
 * KNIFE_RACKSPACE-33 chef-full is new default

data/README.rdoc

@@ -54,7 +54,7 @@ Provisions a new server in the Rackspace Cloud and then perform a Chef bootstrap
 
 == knife rackspace server delete
 
-Deletes an existing server in the currently configured Rackspace Cloud account by the server/instance id. You can find the instance id by entering 'knife rackspace server list'. Please note - this does not delete the associated node and client objects from the Chef server.
+Deletes an existing server in the currently configured Rackspace Cloud account by the server/instance id. You can find the instance id by entering 'knife rackspace server list'. Please note - this does not delete the associated node and client objects from the Chef server unless you pass the <tt>-P</tt> or <tt>--purge</tt> command option.
 
 == knife rackspace server list
 
@@ -73,6 +73,7 @@ Outputs a list of all available images available to the currently configured Rac
 
 Author:: Adam Jacob (<adam@opscode.com>)
 Author:: Seth Chisamore (<schisamo@opscode.com>)
+Author:: Matt Ray (<matt@opscode.com>)
 Copyright:: Copyright (c) 2009-2012 Opscode, Inc.
 License:: Apache License, Version 2.0
 

data/lib/chef/knife/rackspace_base.rb

@@ -71,6 +71,12 @@ class Chef
         Chef::Config[:knife][key] || config[key]
       end
 
+      def msg_pair(label, value, color=:cyan)
+        if value && !value.to_s.empty?
+          puts "#{ui.color(label, color)}: #{value}"
+        end
+      end
+
       def public_dns_name(server)
         @public_dns_name ||= begin
           Resolv.getname(server.addresses["public"][0])

data/lib/chef/knife/rackspace_server_create.rb

@@ -57,6 +57,12 @@ class Chef
         :long => "--node-name NAME",
         :description => "The Chef node name for your new node"
 
+      option :private_network,
+        :long => "--private-network",
+        :description => "Use the private IP for bootstrapping rather than the public IP",
+        :boolean => true,
+        :default => false
+
       option :ssh_user,
         :short => "-x USERNAME",
         :long => "--ssh-user USERNAME",
@@ -101,7 +107,7 @@ class Chef
         :description => "Comma separated list of roles/recipes to apply",
         :proc => lambda { |o| o.split(/[\s,]+/) },
         :default => []
-        
+
       option :first_boot_attributes,
         :short => "-j JSON_ATTRIBS",
         :long => "--json-attributes",
@@ -116,6 +122,12 @@ class Chef
         :proc => Proc.new { |m| Chef::Config[:knife][:rackspace_metadata] = JSON.parse(m) },
         :default => ""
 
+      option :host_key_verify,
+        :long => "--[no-]host-key-verify",
+        :description => "Verify host key, enabled by default",
+        :boolean => true,
+        :default => true
+
       def tcp_test_ssh(hostname)
         tcp_socket = TCPSocket.new(hostname, 22)
         readable = IO.select([tcp_socket], nil, nil, 5)
@@ -155,12 +167,12 @@ class Chef
           :metadata => Chef::Config[:knife][:rackspace_metadata]
         )
 
-        puts "#{ui.color("Instance ID", :cyan)}: #{server.id}"
-        puts "#{ui.color("Host ID", :cyan)}: #{server.host_id}"
-        puts "#{ui.color("Name", :cyan)}: #{server.name}"
-        puts "#{ui.color("Flavor", :cyan)}: #{server.flavor.name}"
-        puts "#{ui.color("Image", :cyan)}: #{server.image.name}"
-        puts "#{ui.color("Metadata", :cyan)}: #{server.metadata}"
+        msg_pair("Instance ID", server.id)
+        msg_pair("Host ID", server.host_id)
+        msg_pair("Name", server.name)
+        msg_pair("Flavor", server.flavor.name)
+        msg_pair("Image", server.image.name)
+        msg_pair("Metadata", server.metadata)
 
         print "\n#{ui.color("Waiting server", :magenta)}"
 
@@ -169,40 +181,55 @@ class Chef
 
         puts("\n")
 
-        puts "#{ui.color("Public DNS Name", :cyan)}: #{public_dns_name(server)}"
-        puts "#{ui.color("Public IP Address", :cyan)}: #{server.addresses["public"][0]}"
-        puts "#{ui.color("Private IP Address", :cyan)}: #{server.addresses["private"][0]}"
-        puts "#{ui.color("Password", :cyan)}: #{server.password}"
+        msg_pair("Public DNS Name", public_dns_name(server))
+        msg_pair("Public IP Address", server.addresses['public'][0])
+        msg_pair("Private IP Address", server.addresses['private'][0])
+        msg_pair("Password", server.password)
 
         print "\n#{ui.color("Waiting for sshd", :magenta)}"
 
-        print(".") until tcp_test_ssh(server.addresses["public"][0]) { sleep @initial_sleep_delay ||= 10; puts("done") }
+        #which IP address to bootstrap
+        bootstrap_ip_address = server.addresses['public'][0] if server.public_ip_address
+        if config[:private_network]
+          bootstrap_ip_address = server.addresses['private'][0]
+        end
+        Chef::Log.debug("Bootstrap IP Address #{bootstrap_ip_address}")
+        if bootstrap_ip_address.nil?
+          ui.error("No IP address available for bootstrapping.")
+          exit 1
+        end
+
+        print(".") until tcp_test_ssh(bootstrap_ip_address) {
+          sleep @initial_sleep_delay ||= 10
+          puts("done")
+        }
 
-        bootstrap_for_node(server).run
+        bootstrap_for_node(server, bootstrap_ip_address).run
 
         puts "\n"
-        puts "#{ui.color("Instance ID", :cyan)}: #{server.id}"
-        puts "#{ui.color("Host ID", :cyan)}: #{server.host_id}"
-        puts "#{ui.color("Name", :cyan)}: #{server.name}"
-        puts "#{ui.color("Flavor", :cyan)}: #{server.flavor.name}"
-        puts "#{ui.color("Image", :cyan)}: #{server.image.name}"
-        puts "#{ui.color("Metadata", :cyan)}: #{server.metadata}"
-        puts "#{ui.color("Public DNS Name", :cyan)}: #{public_dns_name(server)}"
-        puts "#{ui.color("Public IP Address", :cyan)}: #{server.addresses["public"][0]}"
-        puts "#{ui.color("Private IP Address", :cyan)}: #{server.addresses["private"][0]}"
-        puts "#{ui.color("Password", :cyan)}: #{server.password}"
-        puts "#{ui.color("Environment", :cyan)}: #{config[:environment] || '_default'}"
-        puts "#{ui.color("Run List", :cyan)}: #{config[:run_list].join(', ')}"
+        msg_pair("Instance ID", server.id)
+        msg_pair("Host ID", server.host_id)
+        msg_pair("Name", server.name)
+        msg_pair("Flavor", server.flavor.name)
+        msg_pair("Image", server.image.name)
+        msg_pair("Metadata", server.metadata)
+        msg_pair("Public DNS Name", public_dns_name(server))
+        msg_pair("Public IP Address", server.addresses["public"][0])
+        msg_pair("Private IP Address", server.addresses["private"][0])
+        msg_pair("Password", server.password)
+        msg_pair("Environment", config[:environment] || '_default')
+        msg_pair("Run List", config[:run_list].join(', '))
       end
 
-      def bootstrap_for_node(server)
+      def bootstrap_for_node(server, bootstrap_ip_address)
         bootstrap = Chef::Knife::Bootstrap.new
-        bootstrap.name_args = [public_dns_name(server)]
+        bootstrap.name_args = [bootstrap_ip_address]
         bootstrap.config[:run_list] = config[:run_list]
         bootstrap.config[:first_boot_attributes] = config[:first_boot_attributes]
         bootstrap.config[:ssh_user] = config[:ssh_user] || "root"
         bootstrap.config[:ssh_password] = server.password
         bootstrap.config[:identity_file] = config[:identity_file]
+        bootstrap.config[:host_key_verify] = config[:host_key_verify]
         bootstrap.config[:chef_node_name] = config[:chef_node_name] || server.id
         bootstrap.config[:prerelease] = config[:prerelease]
         bootstrap.config[:bootstrap_version] = locate_config_value(:bootstrap_version)

data/lib/chef/knife/rackspace_server_delete.rb

@@ -1,6 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# Author:: Matt Ray (<matt@opscode.com>)
+# Copyright:: Copyright (c) 2009-2012 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,6 +19,10 @@
 
 require 'chef/knife/rackspace_base'
 
+# These two are needed for the '--purge' deletion case
+require 'chef/node'
+require 'chef/api_client'
+
 class Chef
   class Knife
     class RackspaceServerDelete < Knife
@@ -26,31 +31,63 @@ class Chef
 
       banner "knife rackspace server delete SERVER_ID [SERVER_ID] (options)"
 
+      option :purge,
+        :short => "-P",
+        :long => "--purge",
+        :boolean => true,
+        :default => false,
+        :description => "Destroy corresponding node and client on the Chef Server, in addition to destroying the Rackspace node itself. Assumes node and client have the same name as the server (if not, add the '--node-name' option)."
+
+      option :chef_node_name,
+        :short => "-N NAME",
+        :long => "--node-name NAME",
+        :description => "The name of the node and client to delete, if it differs from the server name. Only has meaning when used with the '--purge' option."
+
+      # Extracted from Chef::Knife.delete_object, because it has a
+      # confirmation step built in... By specifying the '--purge'
+      # flag (and also explicitly confirming the server destruction!)
+      # the user is already making their intent known.  It is not
+      # necessary to make them confirm two more times.
+      def destroy_item(klass, name, type_name)
+        begin
+          object = klass.load(name)
+          object.destroy
+          ui.warn("Deleted #{type_name} #{name}")
+        rescue Net::HTTPServerException
+          ui.warn("Could not find a #{type_name} named #{name} to delete!")
+        end
+      end
+
       def run
         @name_args.each do |instance_id|
-          
-          server = connection.servers.get(instance_id)
+          begin
+            server = connection.servers.get(instance_id)
+            msg_pair("Instance ID", server.id)
+            msg_pair("Host ID", server.host_id)
+            msg_pair("Name", server.name)
+            msg_pair("Flavor", server.flavor.name)
+            msg_pair("Image", server.image.name)
+            msg_pair("Public IP Address", server.addresses["public"][0])
+            msg_pair("Private IP Address", server.addresses["private"][0])
 
-          msg("Instance ID", server.id.to_s)
-          msg("Host ID", server.host_id)
-          msg("Name", server.name)
-          msg("Flavor", server.flavor.name)
-          msg("Image", server.image.name)
-          msg("Public DNS Name", server.addresses["public"][0])
-          msg("Private IP Address", server.addresses["private"][0])
+            puts "\n"
+            confirm("Do you really want to delete this server")
 
-          puts "\n"
-          confirm("Do you really want to delete this server")
+            server.destroy
 
-          server.destroy
+            ui.warn("Deleted server #{server.id}")
 
-          ui.warn("Deleted server #{server.id} named #{server.name}")
-        end
-      end
+            if config[:purge]
+              thing_to_delete = config[:chef_node_name] || instance_id
+              destroy_item(Chef::Node, thing_to_delete, "node")
+              destroy_item(Chef::ApiClient, thing_to_delete, "client")
+            else
+              ui.warn("Corresponding node and client for the #{instance_id} server were not deleted and remain registered with the Chef Server")
+            end
 
-      def msg(label, value)
-        if value && !value.empty?
-          puts "#{ui.color(label, :cyan)}: #{value}"
+          rescue NoMethodError
+            ui.error("Could not locate server '#{instance_id}'.")
+          end
         end
       end
     end

data/lib/chef/knife/rackspace_server_list.rb

@@ -49,7 +49,7 @@ class Chef
             case server.state.downcase
             when 'deleted','suspended'
               ui.color(server.state.downcase, :red)
-            when 'build'
+            when 'build','unknown'
               ui.color(server.state.downcase, :yellow)
             else
               ui.color(server.state.downcase, :green)

data/lib/knife-rackspace/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Rackspace
-    VERSION = "0.5.14"
+    VERSION = "0.5.16"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-rackspace
 version: !ruby/object:Gem::Version
-  version: 0.5.14
+  version: 0.5.16
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-15 00:00:00.000000000Z
+date: 2012-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70301854701640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,15 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70301854701640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &70301854701140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,7 +39,12 @@ dependencies:
         version: 0.10.10
   type: :runtime
   prerelease: false
-  version_requirements: *70301854701140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.10
 description: Rackspace Support for Chef's Knife Command
 email:
 - adam@opscode.com
@@ -80,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Rackspace Support for Chef's Knife Command