knife-openstack 0.5.1 → 0.5.2

data/README.rdoc

@@ -6,25 +6,31 @@ This is the official Opscode Knife plugin for OpenStack Compute (Nova). This plu
 
 = 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
+    $ 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 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:
+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"
-    knife[:openstack_api_endpoint]      = "https://cloud.mycompany.com/v1.0"
+    ### 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['OPENSTACK_ACCESS_KEY_ID']}"
-    knife[:openstack_secret_access_key] = "#{ENV['OPENSTACK_SECRET_ACCESS_KEY']}"
-    knife[:openstack_api_endpoint]      = "https://cloud.mycompany.com/v1.0"
+    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
 
@@ -81,4 +87,4 @@ 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.
+limitations under the License.

data/lib/chef/knife/openstack_server_create.rb

@@ -171,8 +171,6 @@ class Chef
           :region => locate_config_value(:region)
         )
 
-        ami = connection.images.get(locate_config_value(:image))
-
         server_def = {
           :image_id => locate_config_value(:image),
           :groups => config[:security_groups],
@@ -180,33 +178,7 @@ class Chef
           :key_name => Chef::Config[:knife][:openstack_ssh_key_id],
           :availability_zone => Chef::Config[:knife][:availability_zone]
         }
-        server_def[:subnet_id] = config[:subnet_id] if config[:subnet_id]
-
-      if ami.root_device_type == "ebs"
-        ami_map = ami.block_device_mapping.first
-        ebs_size = begin
-                     if config[:ebs_size]
-                       Integer(config[:ebs_size]).to_s
-                     else
-                       ami_map["volumeSize"].to_s
-                     end
-                   rescue ArgumentError
-                     puts "--ebs-size must be an integer"
-                     msg opt_parser
-                     exit 1
-                   end
-        delete_term = if config[:ebs_no_delete_on_term]
-                        "false"
-                      else
-                        ami_map["deleteOnTermination"]
-                      end
-        server_def[:block_device_mapping] =
-          [{
-             'DeviceName' => ami_map["deviceName"],
-             'Ebs.VolumeSize' => ebs_size,
-             'Ebs.DeleteOnTermination' => delete_term
-           }]
-      end
+
         server = connection.servers.create(server_def)
 
         puts "#{ui.color("Instance ID", :cyan)}: #{server.id}"
@@ -226,7 +198,7 @@ class Chef
         puts("\n")
 
         puts "#{ui.color("Public DNS Name", :cyan)}: #{server.dns_name}"
-        puts "#{ui.color("Public IP Address", :cyan)}: #{server.ip_address}"
+        puts "#{ui.color("Public IP Address", :cyan)}: #{server.public_ip_address}"
         puts "#{ui.color("Private DNS Name", :cyan)}: #{server.private_dns_name}"
         puts "#{ui.color("Private IP Address", :cyan)}: #{server.private_ip_address}"
 
@@ -246,7 +218,7 @@ class Chef
         puts "#{ui.color("Availability Zone", :cyan)}: #{server.availability_zone}"
         puts "#{ui.color("Security Groups", :cyan)}: #{server.groups.join(", ")}"
         puts "#{ui.color("Public DNS Name", :cyan)}: #{server.dns_name}"
-        puts "#{ui.color("Public IP Address", :cyan)}: #{server.ip_address}"
+        puts "#{ui.color("Public IP Address", :cyan)}: #{server.public_ip_address}"
         puts "#{ui.color("Private DNS Name", :cyan)}: #{server.private_dns_name}"
         puts "#{ui.color("SSH Key", :cyan)}: #{server.key_name}"
         puts "#{ui.color("Private IP Address", :cyan)}: #{server.private_ip_address}"

data/lib/chef/knife/openstack_server_delete.rb

@@ -72,7 +72,7 @@ class Chef
           msg("Security Groups", server.groups.join(", "))
           msg("SSH Key", server.key_name)
           msg("Public DNS Name", server.dns_name)
-          msg("Public IP Address", server.ip_address)
+          msg("Public IP Address", server.public_ip_address)
           msg("Private DNS Name", server.private_dns_name)
           msg("Private IP Address", server.private_ip_address)
 

data/lib/chef/knife/openstack_server_list.rb

@@ -76,7 +76,8 @@ class Chef
         ]
         connection.servers.all.each do |server|
           server_list << server.id.to_s
-          server_list << (server.ip_address == nil ? "" : server.public_ip_address)
+          # 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)

data/lib/knife-openstack/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: knife-openstack
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Seth Chisamore
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-05 00:00:00 -04:00
+date: 2011-04-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency