knife-openstack 0.9.1 → 0.10.0

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## v0.10.0
+DONE
+* KNIFE-368 Ability to specify metadata during OpenStack server create
+* KNIFE-423 Add ability for knife-openstack to specify network IDs to attach
+* KNIFE-428 Added Availability zone to knife openstack
+* KNIFE-467 --no-network fails to find first network IP address
+* KNIFE-471 Explicitly define NIC for private network when creating server
+* KNIFE-474 knife openstack group list throws a fog deprecation warning
+* KNIFE-475 json-attributes option wasnt actually getting passed to bootstrap
+* KNIFE-477 Delete openstack instance by name
+* KNIFE-478 Generated SSH password not passed to bootstrap
+* add support for working with names instead of ids, updated listing accordingly
+
 ## v0.9.1
 * KNIFE-462 missing user_data throws stack
 
@@ -63,19 +76,3 @@
 
 ## V0.5.2
 * initial Cactus release using EC2 API
-
-# BACKLOG/ISSUES #
-This is a list of missing(?) features and open questions currently under development consideration:
-
-* Basic availability zones support (Jarek Zmudzinski) NEED TESTING ACCESS FOR AVAILABILITY ZONES
-* purge only works when names match up with clients
-* `knife openstack floating list|associate|release NODE` with --floating-ip-pool also
-* KNIFE-229 Allow specifying the name of the pool when using floating IPs
-* attempt to allocate a floating ipaddress if none if free, currently missing in Fog
-* KNIFE-76 take either the flavor ID or the flavor name
-* take either the image ID or the image name (similar for KNIFE-76)
-* KNIFE-86 server create with expired password hangs
-* KNIFE-231 added ability to specify arbitrary network ID
-* 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,7 +1,7 @@
 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` through `Grizzly` releases in configurations using Keystone against the OpenStack API (as opposed to the EC2 API).
+This is the official Chef 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 `Icehouse` releases in configurations using Keystone against the OpenStack API (as opposed to the EC2 API).
 
 Please refer to the [CHANGELOG](CHANGELOG.md) for version history and known issues.
 
@@ -19,19 +19,19 @@ Depending on your system's configuration, you may need to run this command with
 
 # Configuration #
 
-In order to communicate with an OpenStack Compute cloud's OpenStack API you will need to tell Knife your OpenStack Compute API endpoint, your Dashboard username and password (tenant is optional). The easiest way to accomplish this is to create these entries in your `knife.rb` file:
+In order to communicate with an OpenStack API you will need to tell Knife your OpenStack Auth API endpoint, your Dashboard username and password (tenant is optional). The easiest way to accomplish this is to create these entries in your `knife.rb` file:
 
-    knife[:openstack_username] = "Your OpenStack Dashboard username"
-    knife[:openstack_password] = "Your OpenStack Dashboard password"
     ### Note: If you are not proxying HTTPS to the OpenStack auth port, the scheme should be HTTP
     knife[:openstack_auth_url] = "http://cloud.mycompany.com:5000/v2.0/tokens"
+    knife[:openstack_username] = "Your OpenStack Dashboard username"
+    knife[:openstack_password] = "Your OpenStack Dashboard password"
     knife[:openstack_tenant] = "Your OpenStack tenant name"
 
 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_auth_url] = "#{ENV['OS_AUTH_URL']}"
     knife[:openstack_username] = "#{ENV['OS_USERNAME']}"
     knife[:openstack_password] = "#{ENV['OS_PASSWORD']}"
-    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:
@@ -56,15 +56,15 @@ Additionally the following options may be set in your `knife.rb`:
 
 # Working with Floating IPs #
 
-To use a floating IP address while bootstrapping nodes, use the `-a` or `--floating-ip` option. For the node to have the floating IP address after bootstrapping, it is required to use the new `openstack.rb` Ohai plugin, waiting for the next Ohai release or installed using the [ohai cookbook](https://github.com/opscode-cookbooks/ohai). https://github.com/mattray/ohai/tree/OHAI-381 is the ticket for this.
+To use a floating IP address while bootstrapping nodes, use the `-a` or `--floating-ip` option.
 
 # Working with Windows Images #
 
-Provisioning and bootstrapping for Windows 2003/2008 images is now supported. The Windows images need to have WinRM enabled with Basic Authentication configured. Current support does not support Kerberos Authentication.
+Provisioning and bootstrapping for Windows 2003 and later images is now supported. The Windows images need to have WinRM enabled with Basic Authentication configured. Current support does not support Kerberos Authentication.
 
 Example:
 
-    knife openstack server create -I <Image_ID> -f <Flavor_ID> -S <keypair_name> --bootstrap-protocol winrm -P <Administrator_Password> -x Administrator -N <chef_node_name> --template windows-chef-client-msi.erb
+    knife openstack server create -I <Image> -f <Flavor> -S <keypair_name> --bootstrap-protocol winrm -P <Administrator_Password> -x Administrator -N <chef_node_name> --template windows-chef-client-msi.erb
 
 NOTE:
 * Bootstrap Protocol (`--bootstrap-protocol`) is required to be set to `winrm`.
@@ -78,42 +78,47 @@ This plugin provides the following Knife subcommands. Specific command options c
 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 [chef-full](https://github.com/opscode/chef/blob/master/chef/lib/chef/knife/bootstrap/chef-full.erb) template (default after the 10.10 release). This may be overridden using the `-d` or `--template-file` command options. If you do not have public IP addresses, use the `--private-network` option to use the private IP address for bootstrapping.
+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 [chef-full](https://github.com/opscode/chef/blob/master/chef/lib/chef/knife/bootstrap/chef-full.erb) template (default since the 10.10 release). This may be overridden using the `-d` or `--template-file` command options. If you do not have public IP addresses, use the `--private-network` option to use the private IP address for bootstrapping or `--bootstrap-network NAME` to specify an alternate network. Please see `knife openstack server create --help` for all of the supported options.
 
 knife openstack server delete
 -----------------------------
 
-Deletes an existing server in the currently configured OpenStack Compute cloud account. If a floating IP address has been assigned to the node, it is disassociated automatically by the OpenStack server. <b>PLEASE NOTE</b> - this does not delete the associated node and client objects from the Chef server without using the `-P` option to purge the client.
+Deletes an existing server in the currently configured OpenStack account. If a floating IP address has been assigned to the node, it is disassociated automatically by the OpenStack server. <b>PLEASE NOTE</b> - this does not delete the associated node and client objects from the Chef server without using the `-P` option to purge the client.
 
 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.
+Outputs a list of all servers in the currently configured OpenStack 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 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.
+Provides a list of all available flavors (available "hardware" configurations for a server) available to the currently configured OpenStack account. Each flavor has a unique combination of virtual cpus, disk space and memory capacity. This data may be useful when choosing a flavor to pass to the `knife openstack server create` subcommand.
 
 knife openstack image list
 --------------------------
 
-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.
+Lists all available images and snapshots available to the currently configured OpenStack 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 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.
+Provides a list of the security groups available to the currently configured OpenStack 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.
+
+knife openstack network list
+--------------------
+
+Lists the networks available to the currently configured OpenStack account. This data may be useful when choosing your networks to pass to the `knife openstack server create` subcommand. This command is only available with OpenStack deployments using the Neutron network service (not nova-network). Please see `knife openstack server delete --help` for all of the supported options.
 
 # License #
 
-Author:: Seth Chisamore (<schisamo@opscode.com>)
+Author:: Seth Chisamore (<schisamo@getchef.com>)
 
-Author:: Matt Ray (<matt@opscode.com>)
+Author:: Matt Ray (<matt@getchef.com>)
 
 Author:: Chirag Jog (<chirag@clogeny.com>)
 
-Copyright:: Copyright (c) 2011-2013 Opscode, Inc.
+Copyright:: Copyright (c) 2011-2014 Chef Software, Inc.
 
 License:: Apache License, Version 2.0
 

data/knife-openstack.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.has_rdoc = true
   s.extra_rdoc_files = ["README.md", "LICENSE" ]
   s.authors     = ["Seth Chisamore", "Matt Ray"]
-  s.email       = ["schisamo@opscode.com", "matt@opscode.com"]
+  s.email       = ["schisamo@getchef.com", "matt@getchef.com"]
   s.homepage    = "https://github.com/opscode/knife-openstack"
   s.summary     = %q{OpenStack Compute Support for Chef's Knife Command}
   s.description = s.summary
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency "fog", ">= 1.10.0"
   s.add_dependency "chef", ">= 0.10.10"
   s.add_dependency "knife-windows"
-  
+
   %w(rspec-core rspec-expectations rspec-mocks rspec_junit_formatter).each { |gem| s.add_development_dependency gem }
   s.require_paths = ["lib"]
 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-2013 Opscode, Inc.
+# Author:: Seth Chisamore (<schisamo@getchef.com>)
+# Author:: Matt Ray (<matt@getchef.com>)
+# Copyright:: Copyright (c) 2011-2014 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -71,6 +71,11 @@ class Chef
             :default => false,
             :proc => Proc.new { |key| Chef::Config[:knife][:openstack_insecure] = key }
 
+          option :availability_zone,
+            :short => "-Z ZONE_NAME",
+            :long => "--availability-zone ZONE_NAME",
+            :description => "The availability zone for this server",
+            :proc => Proc.new { |z| Chef::Config[:knife][:availability_zone] = z }
         end
       end
 
@@ -102,6 +107,35 @@ class Chef
                         end
       end
 
+      def network
+        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}")
+
+        @network ||= begin
+          network = Fog::Network.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],
+            :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
+                     rescue Fog::Errors::NotFound => e
+                       ui.fatal("No OpenStack Network service found. This command is unavailable with nova-network.")
+                       exit 1
+                     end
+      end
+
       def locate_config_value(key)
         key = key.to_sym
         Chef::Config[:knife][key] || config[key]

data/lib/chef/knife/openstack_flavor_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.
+# Author:: Seth Chisamore (<schisamo@getchef.com>)
+# Author:: Matt Ray (<matt@getchef.com>)
+# Copyright:: Copyright (c) 2011-2014 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,16 +32,16 @@ class Chef
         validate!
 
         flavor_list = [
-          ui.color('ID', :bold),
           ui.color('Name', :bold),
+          ui.color('ID', :bold),
           ui.color('Virtual CPUs', :bold),
           ui.color('RAM', :bold),
           ui.color('Disk', :bold),
         ]
         begin
-          connection.flavors.sort_by(&:id).each do |flavor|
-            flavor_list << flavor.id.to_s
+          connection.flavors.sort_by(&:name).each do |flavor|
             flavor_list << flavor.name
+            flavor_list << flavor.id.to_s
             flavor_list << flavor.vcpus.to_s
             flavor_list << "#{flavor.ram.to_s} MB"
             flavor_list << "#{flavor.disk.to_s} GB"

data/lib/chef/knife/openstack_group_list.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Matt Ray (<matt@opscode.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: Matt Ray (<matt@getchef.com>)
+# Copyright:: Copyright (c) 2013-2014 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -39,13 +39,13 @@ class Chef
           ui.color('Description', :bold),
         ]
         connection.security_groups.sort_by(&:name).each do |group|
-          group.rules.each do |rule|
-            unless rule['ip_protocol'].nil?
+          group.security_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 << 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

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-2013 Opscode, Inc.
+# Author:: Seth Chisamore (<schisamo@getchef.com>)
+# Author:: Matt Ray (<matt@getchef.com>)
+# Copyright:: Copyright (c) 2011-2014 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -38,8 +38,8 @@ class Chef
         validate!
 
         image_list = [
-          ui.color('ID', :bold),
           ui.color('Name', :bold),
+          ui.color('ID', :bold),
           ui.color('Snapshot', :bold),
         ]
         begin
@@ -48,8 +48,8 @@ class Chef
           end.each do |image|
             unless ((image.name =~ /initrd$|kernel$|loader$|virtual$|vmlinuz$/) &&
                 !config[:disable_filter])
-              image_list << image.id
               image_list << image.name
+              image_list << image.id
               snapshot = 'no'
               image.metadata.each do |datum|
                 if (datum.key == 'image_type') && (datum.value == 'snapshot')

data/lib/chef/knife/openstack_network_list.rb

@@ -0,0 +1,31 @@
+require 'chef/knife/openstack_base'
+
+class Chef
+  class Knife
+    class OpenstackNetworkList < Knife
+
+      include Knife::OpenstackBase
+
+      banner "knife openstack network list (options)"
+
+      def run
+
+        validate!
+
+        net_list = [
+          ui.color('Name', :bold),
+          ui.color('ID', :bold),
+          ui.color('Tenant', :bold),
+          ui.color('Shared', :bold),
+        ]
+        network.networks.all.sort_by(&:name).each do |network|
+          net_list << network.name
+          net_list << network.id
+          net_list << network.tenant_id
+          net_list << network.shared.to_s
+        end
+        puts ui.list(net_list, :uneven_columns_across, 4)
+      end
+    end
+  end
+end

data/lib/chef/knife/openstack_server_create.rb

@@ -40,15 +40,15 @@ class Chef
       attr_accessor :initial_sleep_delay
 
       option :flavor,
-      :short => "-f FLAVOR_ID",
-      :long => "--flavor FLAVOR_ID",
-      :description => "The flavor ID of server (m1.small, m1.medium, etc)",
+      :short => "-f FLAVOR",
+      :long => "--flavor FLAVOR",
+      :description => "The flavor name or ID of server (m1.small, m1.medium, etc)",
       :proc => Proc.new { |f| Chef::Config[:knife][:flavor] = f }
 
       option :image,
-      :short => "-I IMAGE_ID",
-      :long => "--image IMAGE_ID",
-      :description => "The image ID for the server",
+      :short => "-I IMAGE",
+      :long => "--image IMAGE",
+      :description => "A regexp matching an image name or an image ID for the server",
       :proc => Proc.new { |i| Chef::Config[:knife][:image] = i }
 
       option :security_groups,
@@ -58,11 +58,23 @@ class Chef
       :default => ["default"],
       :proc => Proc.new { |groups| groups.split(',') }
 
+      md = {}
+      option :metadata,
+      :short => "-M X=1",
+      :long => "--metadata X=1",
+      :description => "Metadata information for this server (may pass multiple times)",
+      :proc => Proc.new { |data| md.merge!({data.split('=')[0]=>data.split('=')[1]}) }
+
       option :chef_node_name,
       :short => "-N NAME",
       :long => "--node-name NAME",
       :description => "The Chef node name for your new node"
 
+      option :network_ids,
+      :long => "--network-ids NETWORK_ID_1,NETWORK_ID_2,NETWORK_ID_3",
+      :description => "Comma separated list of the UUID(s) of the network(s) for the server to attach",
+      :proc => Proc.new { |networks| networks.split(',') }
+
       option :floating_ip,
       :short => "-a [IP]",
       :long => "--floating-ip [IP]",
@@ -265,32 +277,33 @@ class Chef
         # servers require a name, generate one if not passed
         node_name = get_node_name(config[:chef_node_name])
 
-        # this really should be caught in Fog
-        if locate_config_value(:user_data).nil?
-          server_def = {
-            :name => node_name,
-            :image_ref => locate_config_value(:image),
-            :flavor_ref => locate_config_value(:flavor),
-            :security_groups => locate_config_value(:security_groups),
-            :key_name => locate_config_value(:openstack_ssh_key_id)
-          }
-        else
-          server_def = {
-            :name => node_name,
-            :image_ref => locate_config_value(:image),
-            :flavor_ref => locate_config_value(:flavor),
-            :security_groups => locate_config_value(:security_groups),
-            :key_name => locate_config_value(:openstack_ssh_key_id),
-            :user_data => locate_config_value(:user_data)
-          }
+        # define the server to be created
+        server_def = {
+          :name => node_name,
+          :image_ref => image.id,
+          :flavor_ref => flavor.id,
+          :security_groups => locate_config_value(:security_groups),
+          :availability_zone => locate_config_value(:availability_zone),
+          :metadata => locate_config_value(:metadata),
+          :key_name => locate_config_value(:openstack_ssh_key_id)
+        }
+        server_def[:user_data] = locate_config_value(:user_data) unless locate_config_value(:user_data).nil?
+        unless locate_config_value(:network_ids).nil?
+          server_def[:nics] = locate_config_value(:network_ids).map do |nic|
+            nic_id = { 'net_id' => nic }
+            nic_id
+          end
         end
+        Chef::Log.debug("server_def is: #{server_def}")
 
         Chef::Log.debug("Name #{node_name}")
+        Chef::Log.debug("Availability Zone #{locate_config_value(:availability_zone)}")
         Chef::Log.debug("Image #{locate_config_value(:image)}")
         Chef::Log.debug("Flavor #{locate_config_value(:flavor)}")
         Chef::Log.debug("Requested Floating IP #{locate_config_value(:floating_ip)}")
         Chef::Log.debug("Security Groups #{locate_config_value(:security_groups)}")
         Chef::Log.debug("User Data #{locate_config_value(:user_data)}")
+        Chef::Log.debug("Metadata #{locate_config_value(:metadata)}")
         Chef::Log.debug("Creating server #{server_def}")
 
         begin
@@ -313,6 +326,7 @@ class Chef
 
         msg_pair("Instance Name", server.name)
         msg_pair("Instance ID", server.id)
+        msg_pair("Availability zone", server.availability_zone)
 
         print "\n#{ui.color("Waiting for server", :magenta)}"
 
@@ -326,8 +340,8 @@ class Chef
         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}")
 
+        Chef::Log.debug("Addresses #{server.addresses}")
         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)
 
@@ -360,7 +374,7 @@ class Chef
         unless config[:network] # --no-network
           bootstrap_ip_address = primary_public_ip_address(server.addresses) ||
             primary_private_ip_address(server.addresses) ||
-            server.addresses.first
+            server.addresses[1][0]['addr']
           Chef::Log.debug("No Bootstrap Network: #{config[:bootstrap_network]}")
         else
           bootstrap_ip_address = primary_network_ip_address(server.addresses, config[:bootstrap_network])
@@ -414,6 +428,7 @@ class Chef
       def bootstrap_common_params(bootstrap, server_name)
         bootstrap.config[:chef_node_name] = config[:chef_node_name] || server_name
         bootstrap.config[:run_list] = config[:run_list]
+        bootstrap.config[:first_boot_attributes] = config[:first_boot_attributes]
         bootstrap.config[:prerelease] = config[:prerelease]
         bootstrap.config[:bootstrap_version] = locate_config_value(:bootstrap_version)
         bootstrap.config[:distro] = locate_config_value(:distro)
@@ -432,6 +447,7 @@ class Chef
         bootstrap = Chef::Knife::Bootstrap.new
         bootstrap.name_args = [bootstrap_ip_address]
         bootstrap.config[:ssh_user] = config[:ssh_user]
+        bootstrap.config[:ssh_password] = config[:ssh_password] || server.password unless config[:ssh_key_name]
         bootstrap.config[:ssh_port] = config[:ssh_port]
         bootstrap.config[:identity_file] = config[:identity_file]
         bootstrap.config[:host_key_verify] = config[:host_key_verify]
@@ -440,11 +456,11 @@ class Chef
       end
 
       def flavor
-        @flavor ||= connection.flavors.get(locate_config_value(:flavor))
+        @flavor ||= connection.flavors.find{|f| f.name == locate_config_value(:flavor) || f.id == locate_config_value(:flavor) }
       end
 
       def image
-        @image ||= connection.images.get(locate_config_value(:image))
+        @image ||= connection.images.find{|img| img.name =~ /#{locate_config_value(:image)}/ || img.id == locate_config_value(:image) }
       end
 
       def is_floating_ip_valid
@@ -461,12 +477,13 @@ class Chef
           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
+          # 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
       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-2013 Opscode, Inc.
+# Author:: Seth Chisamore (<schisamo@getchef.com>)
+# Author:: Matt Ray (<matt@getchef.com>)
+# Copyright:: Copyright (c) 2011-2014 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -64,7 +64,7 @@ class Chef
 
         @name_args.each do |instance_id|
           begin
-            server = connection.servers.get(instance_id)
+            server = connection.servers.find{|s| s.name == instance_id || s.id == instance_id }
 
             msg_pair("Instance Name", server.name)
             msg_pair("Instance ID", server.id)
@@ -74,6 +74,7 @@ class Chef
               msg_pair("Network", name)
               msg_pair("  IP Address", addr[0]['addr'])
             end
+            msg_pair("Availability Zone", server.availability_zone)
 
             puts "\n"
             confirm("Do you really want to delete this server")

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-2013 Opscode, Inc.
+# Author:: Seth Chisamore (<schisamo@getchef.com>)
+# Author:: Matt Ray (<matt@getchef.com>)
+# Copyright:: Copyright (c) 2011-2014 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,8 +33,9 @@ class Chef
         validate!
 
         server_list = [
-          ui.color('Instance ID', :bold),
           ui.color('Name', :bold),
+          ui.color('Instance ID', :bold),
+          ui.color('Zone', :bold),
           ui.color('Public IP', :bold),
           ui.color('Private IP', :bold),
           ui.color('Flavor', :bold),
@@ -44,9 +45,10 @@ class Chef
         ]
 
         begin
-          connection.servers.all.sort_by(&:id).each do |server|
-            server_list << server.id.to_s
+          connection.servers.all.sort_by(&:name).each do |server|
             server_list << server.name
+            server_list << server.id.to_s
+            server_list << server.availability_zone
             if primary_public_ip_address(server.addresses)
               server_list << primary_public_ip_address(server.addresses)
             else
@@ -81,7 +83,7 @@ class Chef
           ui.fatal("Unknown server error (#{response['badRequest']['code']}): #{response['badRequest']['message']}")
           raise e
         end
-        puts ui.list(server_list, :uneven_columns_across, 8)
+        puts ui.list(server_list, :uneven_columns_across, 9)
 
       end
     end

data/lib/knife-openstack/version.rb

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

data/spec/unit/openstack_server_create_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Mukta Aphale (<mukta.aphale@clogeny.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright (c) 2013-2014 Chef Software, Inc.
 
 require File.expand_path('../../spec_helper', __FILE__)
 require 'fog'
@@ -11,8 +11,8 @@ describe Chef::Knife::OpenstackServerCreate do
   before do
 
     @openstack_connection = double(Fog::Compute::OpenStack)
-    @openstack_connection.stub_chain(:flavors, :get).and_return ('flavor_id')
-    @openstack_connection.stub_chain(:images, :get).and_return double('image_id')
+    @openstack_connection.stub_chain(:flavors, :find).and_return double('flavor', {:id => 'flavor_id'})
+    @openstack_connection.stub_chain(:images, :find).and_return double('image', {:id => 'image_id'})
     @openstack_connection.stub_chain(:addresses).and_return [double('addresses', {
           :instance_id => nil,
           :ip => '111.111.111.111',
@@ -38,7 +38,6 @@ describe Chef::Knife::OpenstackServerCreate do
     @knife_openstack_create.stub(:puts)
     @knife_openstack_create.stub(:print)
 
-
     @openstack_servers = double()
     @new_openstack_server = double()
 
@@ -47,14 +46,15 @@ describe Chef::Knife::OpenstackServerCreate do
       :key_name => 'key_name',
       :flavor => 'flavor_id',
       :image => 'image_id',
+      :availability_zone => 'zone1',
       :addresses => {
+        'foo' => [{'addr' => '34.56.78.90'}],
         'public' => [{'addr' => '75.101.253.10'}],
         'private' => [{'addr' => '10.251.75.20'}]
       },
       :password => 'password'
     }
 
-
     @openstack_server_attribs.each_pair do |attrib, value|
       @new_openstack_server.stub(attrib).and_return(value)
     end
@@ -68,6 +68,8 @@ describe Chef::Knife::OpenstackServerCreate do
     it "ensures default options" do
       @options[:bootstrap_protocol][:default].should == nil
       @options[:distro][:default].should == 'chef-full'
+      @options[:availability_zone][:default].should == nil
+      @options[:metadata][:default].should == nil
       @options[:floating_ip][:default].should == '-1'
       @options[:host_key_verify][:default].should == true
       @options[:private_network][:default].should == false
@@ -78,6 +80,7 @@ describe Chef::Knife::OpenstackServerCreate do
       @options[:server_create_timeout][:default].should == 600
       @options[:ssh_port][:default].should == '22'
       @options[:ssh_user][:default].should == 'root'
+      @options[:first_boot_attributes][:default].should == {}
     end
 
     it "doesn't set an OpenStack endpoint type by default" do
@@ -130,6 +133,7 @@ describe Chef::Knife::OpenstackServerCreate do
       @knife_openstack_create.config[:chef_node_name] = "blarf"
       @knife_openstack_create.config[:template_file] = '~/.chef/templates/my-bootstrap.sh.erb'
       @knife_openstack_create.config[:distro] = 'ubuntu-10.04-magic-sparkles'
+      @knife_openstack_create.config[:first_boot_attributes] = {'some_var' => true}
       @knife_openstack_create.config[:run_list] = ['role[base]']
 
       @bootstrap = @knife_openstack_create.bootstrap_for_node(@new_openstack_server,
@@ -160,6 +164,19 @@ describe Chef::Knife::OpenstackServerCreate do
       @bootstrap.config[:chef_node_name].should == 'blarf'
     end
 
+    it "configures the bootstrap to use the server password" do
+      @bootstrap.config[:ssh_password].should == 'password'
+    end
+
+    it "configures the bootstrap to use the config ssh password" do
+      @knife_openstack_create.config[:ssh_password] = 'testing123'
+
+      bootstrap = @knife_openstack_create.bootstrap_for_node(@new_openstack_server,
+        @new_openstack_server.addresses['public'].last['addr'])
+
+      bootstrap.config[:ssh_password].should == 'testing123'
+    end
+
     it "configures the bootstrap to use the OpenStack server id if no explicit node name is set" do
       @knife_openstack_create.config[:chef_node_name] = nil
 
@@ -186,6 +203,10 @@ describe Chef::Knife::OpenstackServerCreate do
       @bootstrap.config[:use_sudo].should be_true
     end
 
+    it "configures the bootstrap with json attributes" do
+      @bootstrap.config[:first_boot_attributes]['some_var'].should be_true
+    end
+
     it "configured the bootstrap to use the desired template" do
       @bootstrap.config[:template_file].should == '~/.chef/templates/my-bootstrap.sh.erb'
     end
@@ -195,4 +216,42 @@ describe Chef::Knife::OpenstackServerCreate do
     end
   end
 
+  describe "when configuring the bootstrap process with private networks" do
+    before do
+      @knife_openstack_create.config[:private_network] = true
+
+      @bootstrap = @knife_openstack_create.bootstrap_for_node(@new_openstack_server,
+        @new_openstack_server.addresses['private'].last['addr'])
+    end
+
+    it "configures the bootstrap to use private network" do
+      @bootstrap.name_args.should == ['10.251.75.20']
+    end
+  end
+
+  describe "when configuring the bootstrap process with alternate networks" do
+    before do
+      @knife_openstack_create.config[:bootstrap_network] = 'foo'
+
+      @bootstrap = @knife_openstack_create.bootstrap_for_node(@new_openstack_server,
+        @new_openstack_server.addresses['foo'].last['addr'])
+    end
+
+    it "configures the bootstrap to use alternate network" do
+      @bootstrap.name_args.should == ['34.56.78.90']
+    end
+  end
+
+  describe "when configuring the bootstrap process with no networks" do
+    before do
+      @knife_openstack_create.config[:network] = false
+
+      @bootstrap = @knife_openstack_create.bootstrap_for_node(@new_openstack_server,
+        @new_openstack_server.addresses['public'].last['addr'])
+    end
+
+    it "configures the bootstrap to use public network since none specified" do
+      @bootstrap.name_args.should == ['75.101.253.10']
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-openstack
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -126,8 +126,8 @@ dependencies:
         version: '0'
 description: OpenStack Compute Support for Chef's Knife Command
 email:
-- schisamo@opscode.com
-- matt@opscode.com
+- schisamo@getchef.com
+- matt@getchef.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -145,6 +145,7 @@ files:
 - 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_network_list.rb
 - lib/chef/knife/openstack_server_create.rb
 - lib/chef/knife/openstack_server_delete.rb
 - lib/chef/knife/openstack_server_list.rb