knife-openstack 0.5.4 → 0.6.0

data/lib/chef/knife/openstack_server_delete.rb

@@ -1,6 +1,7 @@
 #
 # Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Copyright:: Copyright (c) 2011 Opscode, Inc.
+# Author:: Matt Ray (<matt@opscode.com>)
+# Copyright:: Copyright (c) 2011-2012 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,82 +17,86 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require 'chef/knife/openstack_base'
+
+# These two are needed for the '--purge' deletion case
+require 'chef/node'
+require 'chef/api_client'
 
 class Chef
   class Knife
     class OpenstackServerDelete < Knife
 
-      deps do
-        require 'fog'
-        require 'net/ssh/multi'
-        require 'readline'
-        require 'chef/json_compat'
-      end
+      include Knife::OpenstackBase
 
       banner "knife openstack server delete SERVER [SERVER] (options)"
 
-      option :openstack_access_key_id,
-        :short => "-A ID",
-        :long => "--openstack-access-key-id KEY",
-        :description => "Your OpenStack Access Key ID",
-        :proc => Proc.new { |key| Chef::Config[:knife][:openstack_access_key_id] = key }
-
-      option :openstack_secret_access_key,
-        :short => "-K SECRET",
-        :long => "--openstack-secret-access-key SECRET",
-        :description => "Your OpenStack API Secret Access Key",
-        :proc => Proc.new { |key| Chef::Config[:knife][:openstack_secret_access_key] = key }
-
-      option :openstack_api_endpoint,
-        :long => "--openstack-api-endpoint ENDPOINT",
-        :description => "Your OpenStack API endpoint",
-        :proc => Proc.new { |endpoint| Chef::Config[:knife][:openstack_api_endpoint] = endpoint }
-
-      option :region,
-        :long => "--region REGION",
-        :description => "Your OpenStack region",
-        :proc => Proc.new { |region| Chef::Config[:knife][:region] = region }
+      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 OpenStack 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
-        connection = Fog::Compute.new(
-          :provider => 'AWS',
-          :aws_access_key_id => Chef::Config[:knife][:openstack_access_key_id],
-          :aws_secret_access_key => Chef::Config[:knife][:openstack_secret_access_key],
-          :endpoint => Chef::Config[:knife][:openstack_api_endpoint],
-          :region => Chef::Config[:knife][:region] || config[:region]
-        )
-
-        @name_args.each do |instance_id|
-          server = connection.servers.get(instance_id)
-
-          msg("Instance ID", server.id)
-          msg("Flavor", server.flavor_id)
-          msg("Image", server.image_id)
-          msg("Availability Zone", server.availability_zone)
-          msg("Security Groups", server.groups.join(", "))
-          msg("SSH Key", server.key_name)
-          msg("Public DNS Name", server.dns_name)
-          msg("Public IP Address", server.public_ip_address)
-          msg("Private DNS Name", server.private_dns_name)
-          msg("Private IP Address", server.private_ip_address)
-
-          puts "\n"
-          confirm("Do you really want to delete this server")
-
-          server.destroy
 
-          ui.warn("Deleted server #{server.id}")
-        end
-      end
+        validate!
 
-      def msg(label, value)
-        if value && !value.empty?
-          puts "#{ui.color(label, :cyan)}: #{value}"
+        @name_args.each do |instance_id|
+          begin
+            server = connection.servers.get(instance_id)
+
+            msg_pair("Instance ID", server.id)
+            msg_pair("Instance Name", server.name)
+            msg_pair("Flavor", server.flavor['id'])
+            msg_pair("Image", server.image['id'])
+            # msg_pair("Availability Zone", server.availability_zone)
+            # msg_pair("Security Groups", server.groups.join(", "))
+            # msg_pair("SSH Key", server.key_name)
+            msg_pair("Public IP Address", server.public_ip_address['addr'])
+            msg_pair("Private IP Address", server.private_ip_address['addr'])
+
+            puts "\n"
+            confirm("Do you really want to delete this server")
+
+            server.destroy
+
+            ui.warn("Deleted server #{server.id}")
+
+            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
+
+          rescue NoMethodError
+            ui.error("Could not locate server '#{instance_id}'.")
+          end
         end
       end
 
     end
   end
 end
-

data/lib/chef/knife/openstack_server_list.rb

@@ -1,6 +1,7 @@
 #
 # Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Copyright:: Copyright (c) 2011 Opscode, Inc.
+# Author:: Matt Ray (<matt@opscode.com>)
+# Copyright:: Copyright (c) 2011-2012 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,75 +17,60 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require 'chef/knife/openstack_base'
 
 class Chef
   class Knife
     class OpenstackServerList < Knife
 
-      deps do
-        require 'fog'
-        require 'net/ssh/multi'
-        require 'readline'
-        require 'chef/json_compat'
-      end
+      include Knife::OpenstackBase
 
       banner "knife openstack server list (options)"
 
-      option :openstack_access_key_id,
-        :short => "-A ID",
-        :long => "--openstack-access-key-id KEY",
-        :description => "Your OpenStack Access Key ID",
-        :proc => Proc.new { |key| Chef::Config[:knife][:openstack_access_key_id] = key }
-
-      option :openstack_secret_access_key,
-        :short => "-K SECRET",
-        :long => "--openstack-secret-access-key SECRET",
-        :description => "Your OpenStack API Secret Access Key",
-        :proc => Proc.new { |key| Chef::Config[:knife][:openstack_secret_access_key] = key }
-
-      option :openstack_api_endpoint,
-        :long => "--openstack-api-endpoint ENDPOINT",
-        :description => "Your OpenStack API endpoint",
-        :proc => Proc.new { |endpoint| Chef::Config[:knife][:openstack_api_endpoint] = endpoint }
-
-      option :region,
-        :long => "--region REGION",
-        :description => "Your OpenStack region",
-        :proc => Proc.new { |region| Chef::Config[:knife][:region] = region }
-
       def run
-
         $stdout.sync = true
 
-        connection = Fog::Compute.new(
-          :provider => 'AWS',
-          :aws_access_key_id => Chef::Config[:knife][:openstack_access_key_id],
-          :aws_secret_access_key => Chef::Config[:knife][:openstack_secret_access_key],
-          :endpoint => Chef::Config[:knife][:openstack_api_endpoint],
-          :region => Chef::Config[:knife][:region] || config[:region]
-        )
+        validate!
 
         server_list = [
           ui.color('Instance ID', :bold),
+          ui.color('Name', :bold),
           ui.color('Public IP', :bold),
           ui.color('Private IP', :bold),
           ui.color('Flavor', :bold),
           ui.color('Image', :bold),
-          ui.color('Security Groups', :bold),
+          ui.color('Keypair', :bold),
           ui.color('State', :bold)
         ]
-        connection.servers.all.each do |server|
+        connection.servers.all.sort_by(&:id).each do |server|
           server_list << server.id.to_s
-          # HACK these should all be server.blah.to_s as nil.to_s == ''
-          server_list << (server.public_ip_address == nil ? "" : server.public_ip_address)
-          server_list << (server.private_ip_address == nil ? "" : server.private_ip_address)
-          server_list << (server.flavor_id == nil ? "" : server.flavor_id)
-          server_list << (server.image_id == nil ? "" : server.image_id)
-          server_list << server.groups.join(", ")
-          server_list << server.state
+          server_list << server.name
+          if server.public_ip_address.nil?
+            server_list << ''
+          else
+            server_list << server.public_ip_address['addr'].to_s
+          end
+          if server.private_ip_address.nil?
+            server_list << ''
+          else
+            server_list << server.private_ip_address['addr'].to_s
+          end
+          server_list << server.flavor['id'].to_s
+          server_list << server.image['id'].to_s
+          server_list << server.key_name
+          server_list << begin
+                           state = server.state.to_s.downcase
+                           case state
+                           when 'shutting-down','terminated','stopping','stopped','error'
+                             ui.color(state, :red)
+                           when 'pending','build','paused','suspended','hard_reboot'
+                             ui.color(state, :yellow)
+                           else
+                             ui.color(state, :green)
+                           end
+                         end
         end
-        puts ui.list(server_list, :columns_across, 7)
+        puts ui.list(server_list, :uneven_columns_across, 8)
 
       end
     end

data/lib/knife-openstack/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module OpenStack
-    VERSION = "0.5.4"
+    VERSION = "0.6.0"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,101 +1,85 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: knife-openstack
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.6.0
   prerelease: 
-  version: 0.5.4
 platform: ruby
-authors: 
+authors:
 - Seth Chisamore
+- Matt Ray
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-02 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-29 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fog
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70295645863080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.7.2
+      - !ruby/object:Gem::Version
+        version: 1.4.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: net-ssh
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70295645863080
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: &70295645862580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.1.3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.10
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: net-ssh-multi
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.0.1
-  type: :runtime
-  version_requirements: *id003
+  version_requirements: *70295645862580
 description: OpenStack Compute Support for Chef's Knife Command
-email: 
+email:
 - schisamo@opscode.com
+- matt@opscode.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files:
+- README.md
 - LICENSE
-files: 
+files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - knife-openstack.gemspec
+- lib/chef/knife/openstack_base.rb
 - lib/chef/knife/openstack_flavor_list.rb
 - lib/chef/knife/openstack_image_list.rb
 - lib/chef/knife/openstack_server_create.rb
 - lib/chef/knife/openstack_server_delete.rb
 - lib/chef/knife/openstack_server_list.rb
 - lib/knife-openstack/version.rb
-has_rdoc: true
 homepage: https://github.com/opscode/knife-openstack
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: OpenStack Compute Support for Chef's Knife Command
 test_files: []
-

data/README.rdoc

@@ -1,90 +0,0 @@
-= Knife OpenStack
-
-= DESCRIPTION:
-
-This is the official Opscode Knife plugin for OpenStack Compute (Nova). This plugin gives knife the ability to create, bootstrap, and manage instances in OpenStack Compute clouds.
-
-= INSTALLATION:
-
-Be sure you are running the beta version of Chef which supports plugins:
-
-    $ gem install chef --version 0.10.0.beta.6
-
-This plugin is distributed as a Ruby Gem. To install it, run:
-
-    $ gem install knife-openstack
-
-Depending on your system's configuration, you may need to run this command with root privileges.
-
-= CONFIGURATION:
-
-In order to communicate with an OpenStack Compute cloud's EC2 API you will have to tell Knife about your OpenStack Compute cloud API endpoint, OpenStack Access Key and Secret Access Key.  The easiest way to accomplish this is to create some entries in your <tt>knife.rb</tt> file:
-
-    ### Note: You may need to append the :openstack_access_key_id with ":$PROJECT_NAME", if it differs from your OpenStack Username.
-    knife[:openstack_access_key_id]     = "Your OpenStack Access Key ID"
-    knife[:openstack_secret_access_key] = "Your OpenStack Secret Access Key"
-    ### Note: If you are not proxying HTTPS to the OpenStack EC2 API port, the scheme should be HTTP, and the PORT is 8773.
-    knife[:openstack_api_endpoint]      = "https://cloud.mycompany.com/service/Cloud"
-
-If your knife.rb file will be checked into a SCM system (ie readable by others) you may want to read the values from environment variables:
-
-    knife[:openstack_access_key_id]     = "#{ENV['EC2_ACCESS_KEY']}"
-    knife[:openstack_secret_access_key] = "#{ENV['EC2_SECRET_KEY']}"
-    knife[:openstack_api_endpoint]      = "#{ENV['EC2_URL']}"
-
-You also have the option of passing your OpenStack API Key/Secret into the individual knife subcommands using the <tt>-A</tt> (or <tt>--openstack-access-key-id</tt>) <tt>-K</tt> (or <tt>--openstack-secret-access-key</tt>) command options
-
-    # provision a new m1.small Ubuntu 10.04 webserver
-    knife openstack server create 'role[webserver]' -I ami-7000f019 -f m1.small -A 'Your OpenStack Access Key ID' -K 'Your OpenStack Secret Access Key' --openstack-api-endpoint 'https://cloud.mycompany.com/v1.0'
-
-Additionally the following options may be set in your `knife.rb`:
-
-* flavor
-* image
-* availability_zone
-* openstack_ssh_key_id
-* region
-* distro
-* template_file
-
-= SUBCOMMANDS:
-
-This plugin provides the following Knife subcommands.  Specific command options can be found by invoking the subcommand with a <tt>--help</tt> flag
-
-== knife openstack server create
-
-Provisions a new server in an OpenStack Compute cloud and then perform a Chef bootstrap (using the SSH protocol).  The goal of the bootstrap is to get Chef installed on the target system so it can run Chef Client with a Chef Server. The main assumption is a baseline OS installation exists (provided by the provisioning). It is primarily intended for Chef Client systems that talk to a Chef server.  By default the server is bootstrapped using the {ubuntu10.04-gems}[https://github.com/opscode/chef/blob/master/chef/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb] template.  This can be overridden using the <tt>-d</tt> or <tt>--template-file</tt> command options.
-
-== knife openstack server delete
-
-Deletes an existing server in the currently configured OpenStack Compute cloud account.  <b>PLEASE NOTE</b> - this does not delete the associated node and client objects from the Chef server.
-
-== knife openstack server list
-
-Outputs a list of all servers in the currently configured OpenStack Compute cloud account.  <b>PLEASE NOTE</b> - this shows all instances associated with the account, some of which may not be currently managed by the Chef server.
-
-== knife openstack flavor list
-
-Outputs a list of all available flavors (available hardware configuration for a server) available to the currently configured OpenStack Compute cloud account.  Each flavor has a unique combination of disk space, memory capacity and priority for CPU time.  This data can be useful when choosing a flavor id to pass to the <tt>knife openstack server create</tt> subcommand.
-
-== knife openstack image list
-
-Outputs a list of all available images available to the currently configured OpenStack Compute cloud account.  An image is a collection of files used to create or rebuild a server. This data can be useful when choosing an image id to pass to the <tt>knife openstack server create</tt> subcommand.
-
-= LICENSE:
-
-Author:: Seth Chisamore (<schisamo@opscode.com>)
-Copyright:: Copyright (c) 2011 Opscode, Inc.
-License:: Apache License, Version 2.0
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.