knife-openstack 0.6.2 → 0.7.0

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## v0.7.0
+* Update dependency on to Fog 1.10.0
+* 'delay-loading' changes to reduce load-time (Mohit Sethi)
+* Use the hint with the bootstrap method instead of assuming the :personality works with the server.create method (KNIFE-201)
+* Added 'knife openstack group list' for listing security groups and their rules (KNIFE-227)
+* Filter out extraneous images from knife openstack image list and added '--disable-filter' to disable
+* Fixed minor issue for public ip addresses (Edmund Haselwanter)
+* Fixed security groups, adding `-G` support (KNIFE-230)
+* Added snapshots as a new column in image list
+* "knife openstack image list" fails with empty image name (KNIFE-83)(Simon Belluzzo)
+* excon / fog errors are a JSON blob, Rescue fog errors (KNIFE-87)(Bryan McLellan)
+* Better error handling for connection errors.
+* Pass ssh_password to bootstrap (KNIFE-88)(David Petzel)
+* Catch Net Unreachable error (E.J. Finneran)
+* Allow an option to ignore the SSL cert (KNIFE-225)(BK Box)
+* Attach to floating IPs (Mohit Sethi)
+* Key pair is not required (KNIFE-226)(BK Box)
+* Fog 1.10.0 changes API for OpenStack IP addresses (KNIFE-248)
+
 ## v0.6.2
 * Use less pessimistic fog version constraint.
 * Add guards to protect against nil values for private_ip_address
@@ -20,20 +39,22 @@
 * Added support for `--no-host-key-verify` (Lamont Granquist)
 * Added support for `--private-network` for bootstrapping private network
 
-## v0.5.2
+## V0.5.2
 * initial Cactus release using EC2 API
 
 # BACKLOG/ISSUES #
-This is a list of features currently lacking and (eventually) under development:
+This is a list of missing(?) features and open questions currently under development consideration:
 
-* security groups are still broken, appear to be broken in Fog. Add `-G` support for security groups other than 'default'
+* Basic availability zones support (Jarek Zmudzinski) NEED TESTING ACCESS FOR AVAILABILITY ZONES
+* Windows bootstrapping (winrm-based) support for knife-openstack (KNIFE-221) winrm branch, UGLY WARNINGS NEED RESOLUTION
 * purge only works when names match up with clients
-* `knife openstack floating list|associate|disassociate ip|node`
-* take either the flavor ID or the flavor name
-* take either the image ID or the image name
-* more information in `knife openstack image list`
-* get DNS names working
-* availability zones
-* filter out the *-initrd and *-kernel from 'openstack image list'. Fog -> container_format={aki|ari} or disk_format on the same params
+* `knife openstack floating list|associate|release NODE` with --floating-ip-pool also
+* Allow specifying the name of the pool when using floating IPs (KNIFE-229)
+* attempt to allocate a floating ipaddress if none if free, currently missing in Fog
+* take either the flavor ID or the flavor name (KNIFE-76)
+* take either the image ID or the image name (similar for KNIFE-76)
+* server create with expired password hangs (KNIFE-86)
+* added ability to specify arbitrary network ID (KNIFE-231)
 * assumption of only single floating IP (and fog uses the last as the public_ip_address)
 * probably other places public network is assumed that could cause issues
+* fog is putting the original public IP address into the private_ip_address method when you get a floating_ip, this is wrong. Remove KNIFE-248 code once fixed.

data/README.md

@@ -1,9 +1,9 @@
 Knife OpenStack
 ===============
 
-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. It has been tested against the `Diablo` and `Essex` releases in configurations using Keystone against the OpenStack API (as opposed to the EC2 API).
+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. It has been tested against the `Diablo` through pre-`Grizzly` releases in configurations using Keystone against the OpenStack API (as opposed to the EC2 API).
 
-Please refer to the CHANGELOG.md for version history and known limitations. If you are using Floating IP addresses, please refer to the "Working with Floating IPs" section below.
+Please refer to the [CHANGELOG](CHANGELOG.md) for version history and known issues.
 
 # Installation #
 
@@ -34,6 +34,10 @@ If your knife.rb file will be checked into a SCM system (ie readable by others)
     knife[:openstack_auth_url] = "#{ENV['OS_AUTH_URL']}"
     knife[:openstack_tenant] = "#{ENV['OS_TENANT_NAME']}"
 
+If your OpenStack deployment is over SSL, but does not have a valid certificate, you can add the following option to bypass SSL check:
+
+    knife[:openstack_insecure] = true
+
 You also have the option of passing your OpenStack API Username/Password into the individual knife subcommands using the `-A` (or `--openstack-username`) `-K` (or `--openstack-password`) command options
 
     # provision a new image named kb01
@@ -72,12 +76,17 @@ Outputs a list of all servers in the currently configured OpenStack Compute clou
 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 virtual cpus, disk space and memory capacity. This data can be useful when choosing a flavor id to pass to the `knife openstack server create` subcommand.
+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 virtual cpus, disk space and memory capacity. This data may be useful when choosing a flavor id to pass to the `knife openstack server create` 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 `knife openstack server create` subcommand.
+Outputs a list of all available images and snapshots available to the currently configured OpenStack Compute cloud account. An image is a collection of files used to create or rebuild a server. The retuned list filters out image names ending in 'initrd', 'kernel', 'loader', 'virtual' or 'vmlinuz' (this may be disabled with `--disable-filter`). This data may be useful when choosing an image id to pass to the `knife openstack server create` subcommand.
+
+knife openstack group list
+--------------------
+
+Outputs a list of the security groups available to the currently configured OpenStack Compute cloud account. Each group may have multiple rules. This data may be useful when choosing your security group(s) to pass to the `knife openstack server create` subcommand.
 
 # License #
 
@@ -85,7 +94,7 @@ Author:: Seth Chisamore (<schisamo@opscode.com>)
 
 Author:: Matt Ray (<matt@opscode.com>)
 
-Copyright:: Copyright (c) 2011-2012 Opscode, Inc.
+Copyright:: Copyright (c) 2011-2013 Opscode, Inc.
 
 License:: Apache License, Version 2.0
 

data/knife-openstack.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "fog", "~> 1.4"
+  s.add_dependency "fog", ">= 1.10.0"
   s.add_dependency "chef", ">= 0.10.10"
 end

data/lib/chef/knife/openstack_base.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Seth Chisamore (<schisamo@opscode.com>)
 # Author:: Matt Ray (<matt@opscode.com>)
-# Copyright:: Copyright (c) 2011-2012 Opscode, Inc.
+# Copyright:: Copyright (c) 2011-2013 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require 'fog'
 
 class Chef
   class Knife
@@ -30,9 +30,10 @@ class Chef
         includer.class_eval do
 
           deps do
-            require 'fog'
-            require 'readline'
             require 'chef/json_compat'
+            require 'chef/knife'
+            require 'readline'
+            Chef::Knife.load_deps
           end
 
           option :openstack_username,
@@ -57,6 +58,13 @@ class Chef
             :long => "--openstack-api-endpoint ENDPOINT",
             :description => "Your OpenStack API endpoint",
             :proc => Proc.new { |endpoint| Chef::Config[:knife][:openstack_auth_url] = endpoint }
+
+          option :openstack_insecure,
+            :long => "--insecure",
+            :description => "Ignore SSL certificate on the Auth URL",
+            :boolean => true,
+            :default => false,
+            :proc => Proc.new { |key| Chef::Config[:knife][:openstack_insecure] = key }
         end
       end
 
@@ -64,15 +72,26 @@ class Chef
         Chef::Log.debug("openstack_username #{Chef::Config[:knife][:openstack_username]}")
         Chef::Log.debug("openstack_auth_url #{Chef::Config[:knife][:openstack_auth_url]}")
         Chef::Log.debug("openstack_tenant #{Chef::Config[:knife][:openstack_tenant]}")
+        Chef::Log.debug("openstack_insecure #{Chef::Config[:knife][:openstack_insecure].to_s}")
+
         @connection ||= begin
           connection = Fog::Compute.new(
             :provider => 'OpenStack',
             :openstack_username => Chef::Config[:knife][:openstack_username],
             :openstack_api_key => Chef::Config[:knife][:openstack_password],
             :openstack_auth_url => Chef::Config[:knife][:openstack_auth_url],
-            :openstack_tenant => Chef::Config[:knife][:openstack_tenant]
-          )
-        end
+            :openstack_tenant => Chef::Config[:knife][:openstack_tenant],
+            :connection_options => {
+              :ssl_verify_peer => !Chef::Config[:knife][:openstack_insecure]
+            }
+            )
+                        rescue Excon::Errors::Unauthorized => e
+                          ui.fatal("Connection failure, please check your OpenStack username and password.")
+                          exit 1
+                        rescue Excon::Errors::SocketError => e
+                          ui.fatal("Connection failure, please check your OpenStack authentication URL.")
+                          exit 1
+                        end
       end
 
       def locate_config_value(key)
@@ -101,6 +120,20 @@ class Chef
         end
       end
 
+      # http://tickets.opscode.com/browse/KNIFE-248
+      def primary_private_ip_address(addresses)
+        if addresses['private']
+          return addresses['private'].last['addr']
+        end
+      end
+
+      #we use last since the floating IP goes there
+      def primary_public_ip_address(addresses)
+        if addresses['public']
+          return addresses['public'].last['addr']
+        end
+      end
+
     end
   end
 end

data/lib/chef/knife/openstack_flavor_list.rb

@@ -38,12 +38,18 @@ class Chef
           ui.color('RAM', :bold),
           ui.color('Disk', :bold),
         ]
-        connection.flavors.sort_by(&:id).each do |flavor|
-          flavor_list << flavor.id.to_s
-          flavor_list << flavor.name
-          flavor_list << flavor.vcpus.to_s
-          flavor_list << "#{flavor.ram.to_s} MB"
-          flavor_list << "#{flavor.disk.to_s} GB"
+        begin
+          connection.flavors.sort_by(&:id).each do |flavor|
+            flavor_list << flavor.id.to_s
+            flavor_list << flavor.name
+            flavor_list << flavor.vcpus.to_s
+            flavor_list << "#{flavor.ram.to_s} MB"
+            flavor_list << "#{flavor.disk.to_s} GB"
+          end
+        rescue Excon::Errors::BadRequest => e
+          response = Chef::JSONCompat.from_json(e.response.body)
+          ui.fatal("Unknown server error (#{response['badRequest']['code']}): #{response['badRequest']['message']}")
+          raise e
         end
         puts ui.list(flavor_list, :uneven_columns_across, 5)
       end

data/lib/chef/knife/openstack_group_list.rb

@@ -0,0 +1,57 @@
+#
+# Author:: Matt Ray (<matt@opscode.com>)
+# Copyright:: Copyright (c) 2013 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.
+#
+
+require 'chef/knife/openstack_base'
+
+class Chef
+  class Knife
+    class OpenstackGroupList < Knife
+
+      include Knife::OpenstackBase
+
+      banner "knife openstack group list (options)"
+
+      def run
+
+        validate!
+
+        group_list = [
+          ui.color('Name', :bold),
+          ui.color('Protocol', :bold),
+          ui.color('From', :bold),
+          ui.color('To', :bold),
+          ui.color('CIDR', :bold),
+          ui.color('Description', :bold),
+        ]
+        connection.security_groups.sort_by(&:name).each do |group|
+          group.rules.each do |rule|
+            unless rule['ip_protocol'].nil?
+              group_list << group.name
+              group_list << rule['ip_protocol']
+              group_list << rule['from_port'].to_s
+              group_list << rule['to_port'].to_s
+              group_list << rule['ip_range']['cidr']
+              group_list << group.description
+            end
+          end
+        end
+        puts ui.list(group_list, :uneven_columns_across, 6)
+      end
+    end
+  end
+end

data/lib/chef/knife/openstack_image_list.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Seth Chisamore (<schisamo@opscode.com>)
 # Author:: Matt Ray (<matt@opscode.com>)
-# Copyright:: Copyright (c) 2011-2012 Opscode, Inc.
+# Copyright:: Copyright (c) 2011-2013 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,6 +27,12 @@ class Chef
 
       banner "knife openstack image list (options)"
 
+      option :disable_filter,
+      :long => "--disable-filter",
+      :description => "Disable filtering of the image list. Currently filters names ending with 'initrd' or 'kernel'",
+      :boolean => true,
+      :default => false
+
       def run
 
         validate!
@@ -34,28 +40,31 @@ class Chef
         image_list = [
           ui.color('ID', :bold),
           ui.color('Name', :bold),
-          # ui.color('Kernel ID', :bold),
-          # ui.color('Architecture', :bold),
-          # ui.color('Root Store', :bold),
-          # ui.color('Location', :bold)
+          ui.color('Snapshot', :bold),
         ]
-
-        connection.images.sort_by do |image|
-          [image.name.downcase, image.id].compact
-        end.each do |image|
-          image_list << image.id
-          image_list << image.name
-          # image_list << image.kernel_id
-          # image_list << image.architecture
-          # image_list << image.root_device_type
-          # image_list << image.location
+        begin
+          connection.images.sort_by do |image|
+            [image.name.to_s.downcase, image.id].compact
+          end.each do |image|
+            unless ((image.name =~ /initrd$|kernel$|loader$|virtual$|vmlinuz$/) &&
+                !config[:disable_filter])
+              image_list << image.id
+              image_list << image.name
+              snapshot = 'no'
+              image.metadata.each do |datum|
+                if (datum.key == 'image_type') && (datum.value == 'snapshot')
+                  snapshot = 'yes'
+                end
+              end
+              image_list << snapshot
+            end
+          end
+        rescue Excon::Errors::BadRequest => e
+          response = Chef::JSONCompat.from_json(e.response.body)
+          ui.fatal("Unknown server error (#{response['badRequest']['code']}): #{response['badRequest']['message']}")
+          raise e
         end
-
-        image_list = image_list.map do |item|
-          item.to_s
-        end
-
-        puts ui.list(image_list, :uneven_columns_across, 2)
+        puts ui.list(image_list, :uneven_columns_across, 3)
       end
     end
   end

data/lib/chef/knife/openstack_server_create.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Seth Chisamore (<schisamo@opscode.com>)
 # Author:: Matt Ray (<matt@opscode.com>)
-# Copyright:: Copyright (c) 2011-2012 Opscode, Inc.
+# Copyright:: Copyright (c) 2011-2013 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -49,12 +49,12 @@ class Chef
       :description => "The image ID for the server",
       :proc => Proc.new { |i| Chef::Config[:knife][:image] = i }
 
-      # option :security_groups,
-      # :short => "-G X,Y,Z",
-      # :long => "--groups X,Y,Z",
-      # :description => "The security groups for this server",
-      # :default => ["default"],
-      # :proc => Proc.new { |groups| groups.split(',') }
+      option :security_groups,
+      :short => "-G X,Y,Z",
+      :long => "--groups X,Y,Z",
+      :description => "The security groups for this server",
+      :default => ["default"],
+      :proc => Proc.new { |groups| groups.split(',') }
 
       option :chef_node_name,
       :short => "-N NAME",
@@ -62,11 +62,10 @@ class Chef
       :description => "The Chef node name for your new node"
 
       option :floating_ip,
-      :short => "-a",
-      :long => "--floating-ip",
-      :boolean => true,
-      :default => false,
-      :description => "Request to associate a floating IP address to the new OpenStack node. Assumes IPs have been allocated to the project."
+      :short => "-a [IP]",
+      :long => "--floating-ip [IP]",
+      :default => "-1",
+      :description => "Request to associate a floating IP address to the new OpenStack node. Assumes IPs have been allocated to the project. Specific IP is optional."
 
       option :private_network,
       :long => "--private-network",
@@ -148,7 +147,7 @@ class Chef
       rescue Errno::ECONNREFUSED
         sleep 2
         false
-      rescue Errno::EHOSTUNREACH
+      rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH
         sleep 2
         false
       rescue Errno::ENETUNREACH
@@ -163,14 +162,6 @@ class Chef
 
         validate!
 
-        connection = Fog::Compute.new(
-          :provider => 'OpenStack',
-          :openstack_username => Chef::Config[:knife][:openstack_username],
-          :openstack_api_key => Chef::Config[:knife][:openstack_password],
-          :openstack_auth_url => Chef::Config[:knife][:openstack_auth_url],
-          :openstack_tenant => Chef::Config[:knife][:openstack_tenant]
-          )
-
         #servers require a name, generate one if not passed
         node_name = get_node_name(config[:chef_node_name])
 
@@ -178,25 +169,37 @@ class Chef
         :name => node_name,
         :image_ref => locate_config_value(:image),
         :flavor_ref => locate_config_value(:flavor),
-        # :security_group => locate_config_value(:security_groups),
-        :key_name => Chef::Config[:knife][:openstack_ssh_key_id],
-        :personality => [{
-            "path" => "/etc/chef/ohai/hints/openstack.json",
-            "contents" => ''
-          }]
+        :security_groups => locate_config_value(:security_groups),
+        :key_name => locate_config_value(:openstack_ssh_key_id)
       }
 
       Chef::Log.debug("Name #{node_name}")
       Chef::Log.debug("Image #{locate_config_value(:image)}")
       Chef::Log.debug("Flavor #{locate_config_value(:flavor)}")
-      # Chef::Log.debug("Groups #{locate_config_value(:security_groups)}")
+      Chef::Log.debug("Requested Floating IP #{locate_config_value(:floating_ip)}")
+      Chef::Log.debug("Security Groups #{locate_config_value(:security_groups)}")
       Chef::Log.debug("Creating server #{server_def}")
-      server = connection.servers.create(server_def)
+
+      begin
+        server = connection.servers.create(server_def)
+      rescue Excon::Errors::BadRequest => e
+        response = Chef::JSONCompat.from_json(e.response.body)
+        if response['badRequest']['code'] == 400
+          if response['badRequest']['message'] =~ /Invalid flavorRef/
+            ui.fatal("Bad request (400): Invalid flavor specified: #{server_def[:flavor_ref]}")
+            exit 1
+          else
+            ui.fatal("Bad request (400): #{response['badRequest']['message']}")
+            exit 1
+          end
+        else
+          ui.fatal("Unknown server error (#{response['badRequest']['code']}): #{response['badRequest']['message']}")
+          raise e
+        end
+      end
 
       msg_pair("Instance Name", server.name)
       msg_pair("Instance ID", server.id)
-      # msg_pair("Security Groups", server.groups.join(", "))
-      msg_pair("SSH Keypair", server.key_name)
 
       print "\n#{ui.color("Waiting for server", :magenta)}"
 
@@ -207,35 +210,44 @@ class Chef
 
       msg_pair("Flavor", server.flavor['id'])
       msg_pair("Image", server.image['id'])
-      msg_pair("Public IP Address", server.public_ip_address['addr']) if server.public_ip_address
-
-      if config[:floating_ip]
-        associated = false
-        connection.addresses.each do |address|
-          if address.instance_id.nil?
-            server.associate_address(address.ip)
-            #a bit of a hack, but server.reload takes a long time
-            server.addresses['public'].push({"version"=>4,"addr"=>address.ip})
-            associated = true
-            msg_pair("Floating IP Address", address.ip)
-            break
+      msg_pair("SSH Identity File", config[:identity_file])
+      msg_pair("SSH Keypair", server.key_name) if server.key_name
+      msg_pair("SSH Password", server.password) if (server.password && !server.key_name)
+      Chef::Log.debug("Addresses #{server.addresses}")
+      msg_pair("Public IP Address", primary_public_ip_address(server.addresses)) if primary_public_ip_address(server.addresses)
+
+      floating_address = locate_config_value(:floating_ip)
+      Chef::Log.debug("Floating IP Address requested #{floating_address}")
+      unless (floating_address == '-1') #no floating IP requested
+        addresses = connection.addresses
+        #floating requested without value
+        if floating_address.nil?
+          free_floating = addresses.find_index {|a| a.fixed_ip.nil?}
+          if free_floating.nil? #no free floating IP found
+            ui.error("Unable to assign a Floating IP from allocated IPs.")
+            exit 1
+          else
+            floating_address = addresses[free_floating].ip
           end
         end
-        unless associated
-          ui.error("Unable to associate floating IP.")
-          exit 1
-        end
+        server.associate_address(floating_address)
+        #a bit of a hack, but server.reload takes a long time
+        (server.addresses['public'] ||= []) << {"version"=>4,"addr"=>floating_address}
+        msg_pair("Floating IP Address", floating_address)
       end
-      Chef::Log.debug("Public IP Address actual #{server.public_ip_address['addr']}") if server.public_ip_address
 
-      msg_pair("Private IP Address", server.private_ip_address['addr']) if server.private_ip_address
+      Chef::Log.debug("Addresses #{server.addresses}")
+      Chef::Log.debug("Public IP Address actual: #{primary_public_ip_address(server.addresses)}") if primary_public_ip_address(server.addresses)
+
+      msg_pair("Private IP Address", primary_private_ip_address(server.addresses)) if primary_private_ip_address(server.addresses)
 
       #which IP address to bootstrap
-      bootstrap_ip_address = server.public_ip_address['addr'] if server.public_ip_address
+      bootstrap_ip_address = primary_public_ip_address(server.addresses) if primary_public_ip_address(server.addresses)
       if config[:private_network]
-        bootstrap_ip_address = server.private_ip_address['addr']
+        bootstrap_ip_address = primary_private_ip_address(server.addresses)
       end
-      Chef::Log.debug("Bootstrap IP Address #{bootstrap_ip_address}")
+
+      Chef::Log.debug("Bootstrap IP Address: #{bootstrap_ip_address}")
       if bootstrap_ip_address.nil?
         ui.error("No IP address available for bootstrapping.")
         exit 1
@@ -255,10 +267,10 @@ class Chef
       msg_pair("Instance ID", server.id)
       msg_pair("Flavor", server.flavor['id'])
       msg_pair("Image", server.image['id'])
-      # msg_pair("Security Groups", server.groups.join(", "))
-      msg_pair("SSH Keypair", server.key_name)
-      msg_pair("Public IP Address", server.public_ip_address['addr']) if server.public_ip_address
-      msg_pair("Private IP Address", server.private_ip_address['addr']) if server.private_ip_address
+      msg_pair("SSH Keypair", server.key_name) if server.key_name
+      msg_pair("SSH Password", server.password) if (server.password && !server.key_name)
+      msg_pair("Public IP Address", primary_public_ip_address(server.addresses)) if primary_public_ip_address(server.addresses)
+      msg_pair("Private IP Address", primary_private_ip_address(server.addresses)) if primary_private_ip_address(server.addresses)
       msg_pair("Environment", config[:environment] || '_default')
       msg_pair("Run List", config[:run_list].join(', '))
     end
@@ -268,6 +280,7 @@ class Chef
       bootstrap.name_args = [bootstrap_ip_address]
       bootstrap.config[:run_list] = config[:run_list]
       bootstrap.config[:ssh_user] = config[:ssh_user]
+      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] = server.name
@@ -277,19 +290,58 @@ class Chef
       bootstrap.config[:use_sudo] = true unless config[:ssh_user] == 'root'
       bootstrap.config[:template_file] = locate_config_value(:template_file)
       bootstrap.config[:environment] = config[:environment]
+      # let ohai know we're using OpenStack
+      Chef::Config[:knife][:hints] ||= {}
+      Chef::Config[:knife][:hints]['openstack'] ||= {}
       bootstrap
     end
 
-    def ami
-      @ami ||= connection.images.get(locate_config_value(:image))
+    def flavor
+      @flavor ||= connection.flavors.get(locate_config_value(:flavor))
+    end
+
+    def image
+      @image ||= connection.images.get(locate_config_value(:image))
+    end
+
+    def is_floating_ip_valid
+      address = locate_config_value(:floating_ip)
+      if address == '-1' #no floating IP requested
+        return true
+      end
+      addresses = connection.addresses
+      return false if addresses.empty? #no floating IPs
+      #floating requested without value
+      if address.nil?
+        if addresses.find_index {|a| a.fixed_ip.nil?}
+          return true
+        else
+          return false #no floating IPs available
+        end
+      end
+      #floating requested with value
+      if addresses.find_index {|a| a.ip == address}
+        return true
+      else
+        return false #requested floating IP does not exist
+      end
     end
 
     def validate!
+      super([:image, :openstack_username, :openstack_password, :openstack_auth_url])
+
+      if flavor.nil?
+        ui.error("You have not provided a valid flavor ID. Please note the options for this value are -f or --flavor.")
+        exit 1
+      end
 
-      super([:image, :openstack_ssh_key_id, :openstack_username, :openstack_password, :openstack_auth_url])
+      if image.nil?
+        ui.error("You have not provided a valid image ID. Please note the options for this value are -I or --image.")
+        exit 1
+      end
 
-      if ami.nil?
-        ui.error("You have not provided a valid image ID. Please note the short option for this value recently changed from '-i' to '-I'.")
+      if !is_floating_ip_valid
+        ui.error("You have either requested an invalid floating IP address or none are available.")
         exit 1
       end
     end

data/lib/chef/knife/openstack_server_delete.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Seth Chisamore (<schisamo@opscode.com>)
 # Author:: Matt Ray (<matt@opscode.com>)
-# Copyright:: Copyright (c) 2011-2012 Opscode, Inc.
+# Copyright:: Copyright (c) 2011-2013 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -66,15 +66,13 @@ class Chef
           begin
             server = connection.servers.get(instance_id)
 
-            msg_pair("Instance ID", server.id)
             msg_pair("Instance Name", server.name)
+            msg_pair("Instance ID", server.id)
             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']) if server.public_ip_address
-            msg_pair("Private IP Address", server.private_ip_address['addr']) if server.private_ip_address
+            msg_pair("Public IP Address", primary_public_ip_address(server.addresses)) if primary_public_ip_address(server.addresses)
+            msg_pair("Private IP Address", primary_private_ip_address(server.addresses)) if primary_private_ip_address(server.addresses)
+
 
             puts "\n"
             confirm("Do you really want to delete this server")
@@ -93,6 +91,10 @@ class Chef
 
           rescue NoMethodError
             ui.error("Could not locate server '#{instance_id}'.")
+          rescue Excon::Errors::BadRequest => e
+            response = Chef::JSONCompat.from_json(e.response.body)
+            ui.fatal("Unknown server error (#{response['badRequest']['code']}): #{response['badRequest']['message']}")
+            raise e
           end
         end
       end

data/lib/chef/knife/openstack_server_list.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Seth Chisamore (<schisamo@opscode.com>)
 # Author:: Matt Ray (<matt@opscode.com>)
-# Copyright:: Copyright (c) 2011-2012 Opscode, Inc.
+# Copyright:: Copyright (c) 2011-2013 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -42,33 +42,40 @@ class Chef
           ui.color('Keypair', :bold),
           ui.color('State', :bold)
         ]
-        connection.servers.all.sort_by(&:id).each do |server|
-          server_list << server.id.to_s
-          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)
+
+        begin
+          connection.servers.all.sort_by(&:id).each do |server|
+            server_list << server.id.to_s
+            server_list << server.name
+            if primary_public_ip_address(server.addresses)
+              server_list << primary_public_ip_address(server.addresses)
+            else
+              server_list << ''
+            end
+            if primary_private_ip_address(server.addresses)
+              server_list << primary_private_ip_address(server.addresses)
+            else
+              server_list << ''
+            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','shutoff'
+                               ui.color(state, :red)
+                             when 'pending','build','paused','suspended','hard_reboot'
+                               ui.color(state, :yellow)
+                             else
+                               ui.color(state, :green)
+                             end
                            end
-                         end
+          end
+        rescue Excon::Errors::BadRequest => e
+          response = Chef::JSONCompat.from_json(e.response.body)
+          ui.fatal("Unknown server error (#{response['badRequest']['code']}): #{response['badRequest']['message']}")
+          raise e
         end
         puts ui.list(server_list, :uneven_columns_across, 8)
 
@@ -76,5 +83,3 @@ class Chef
     end
   end
 end
-
-

data/lib/knife-openstack/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-openstack
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,24 +10,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-15 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
@@ -63,6 +63,7 @@ files:
 - knife-openstack.gemspec
 - lib/chef/knife/openstack_base.rb
 - lib/chef/knife/openstack_flavor_list.rb
+- lib/chef/knife/openstack_group_list.rb
 - lib/chef/knife/openstack_image_list.rb
 - lib/chef/knife/openstack_server_create.rb
 - lib/chef/knife/openstack_server_delete.rb
@@ -88,9 +89,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: OpenStack Compute Support for Chef's Knife Command
 test_files: []
-has_rdoc: true