knife-rackspace 0.5.12 → 0.5.14

data/CHANGELOG.md

@@ -0,0 +1,16 @@
+## v0.5.14
+* KNIFE_RACKSPACE-25 version bump to match knife-ec2's dependencies
+* KNIFE_RACKSPACE-33 chef-full is new default
+* updated authors
+* Fix of small typo "backspace" > "rackspace".
+* KNIFE_RACKSPACE-31 chef dependency needed, add explicit gem deps
+* KNIFE_RACKSPACE-7 switch to uneven_columns_across for prettier output
+* updated for rackspace_api_username and the correct current image number for Ubuntu 10.04 LTS
+* KNIFE-RACKSPACE-26 fog doesn't provide cores enumeration anymore
+* updated copyright and removed trailing comma
+* KNIFE_RACKSPACE-30 Make use of --json-attributes option for knife
+  bootstrap.
+
+## v0.5.12
+* remove dependency on net-ssh and net-ssh-multi..neither is access directly in plugin
+* KNIFE_RACKSPACE-18: Increase net-ssh-multi dependecy to 1.1.0

data/README.rdoc

@@ -18,22 +18,22 @@ Depending on your system's configuration, you may need to run this command with
 
 = CONFIGURATION:
 
-In order to communicate with the Rackspace Cloud API you will have to tell Knife about your Username and API Key.  The easiest way to accomplish this is to create some entries in your <tt>knife.rb</tt> file:
+In order to communicate with the Rackspace Cloud API you will have to tell Knife about your Username and API Key. The easiest way to accomplish this is to create some entries in your <tt>knife.rb</tt> file:
 
-    knife[:rackspace_username] = "Your Rackspace API username"
-    knife[:rackspace_api_key]  = "Your Rackspace API Key"
+    knife[:rackspace_api_username] = "Your Rackspace API username"
+    knife[:rackspace_api_key] = "Your Rackspace API Key"
 
 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[:rackspace_username] = "#{ENV['RACKSPACE_USERNAME']}"
+    knife[:rackspace_api_username] = "#{ENV['RACKSPACE_USERNAME']}"
     knife[:rackspace_api_key] = "#{ENV['RACKSPACE_API_KEY']}"
 
 You also have the option of passing your Rackspace API Username/Key into the individual knife subcommands using the <tt>-A</tt> (or <tt>--rackspace-api-username</tt>) <tt>-K</tt> (or <tt>--rackspace-api-key</tt>) command options
 
     # provision a new 1GB Ubuntu 10.04 webserver
-    knife rackspace server create 'role[webserver]' -I 49 -f 3 -A 'Your Rackspace API username' -K "Your Rackspace API Key"
+    knife rackspace server create -I 112 -f 3 -A 'Your Rackspace API username' -K "Your Rackspace API Key" -r 'role[webserver]'
 
-This plugin also has support for authenticating against an alternate API Auth URL.  This is useful if you are a Rackspace Cloud UK user or OpenStack early adopter.  Here is an example of configuring knife for Rackspace Cloud UK:
+This plugin also has support for authenticating against an alternate API Auth URL. This is useful if you are a Rackspace Cloud UK user or OpenStack early adopter. Here is an example of configuring knife for Rackspace Cloud UK:
 
     knife[:rackspace_api_auth_url] = "lon.auth.api.rackspacecloud.com"
 
@@ -46,34 +46,34 @@ Additionally the following options may be set in your `knife.rb`:
 
 = SUBCOMMANDS:
 
-This plugin provides the following Knife subcommands.  Specific command options can be found by invoking the subcommand with a <tt>--help</tt> flag
+This plugin provides the following Knife subcommands. Specific command options can be found by invoking the subcommand with a <tt>--help</tt> flag
 
 == knife rackspace server create
 
-Provisions a new server in the Rackspace 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.
+Provisions a new server in the Rackspace 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 rackspace server delete
 
-Deletes an existing server in the currently configured Rackspace Cloud account by the server/instance id. You can find the instance id by entering 'knife backspace server list'. Please note - this does not delete the associated node and client objects from the Chef server.
+Deletes an existing server in the currently configured Rackspace Cloud account by the server/instance id. You can find the instance id by entering 'knife rackspace server list'. Please note - this does not delete the associated node and client objects from the Chef server.
 
 == knife rackspace server list
 
-Outputs a list of all servers in the currently configured Rackspace Cloud account.  Please note - 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 Rackspace Cloud account. Please note - this shows all instances associated with the account, some of which may not be currently managed by the Chef server.
 
 == knife rackspace flavor list
 
-Outputs a list of all available flavors (available hardware configuration for a server) available to the currently configured Rackspace 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 rackspace server create</tt> subcommand.
+Outputs a list of all available flavors (available hardware configuration for a server) available to the currently configured Rackspace 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 rackspace server create</tt> subcommand.
 
 == knife rackspace image list
 
-Outputs a list of all available images available to the currently configured Rackspace Cloud account.  An image is a collection of files used to create or rebuild a server. Rackspace provides a number of pre-built OS images by default.  This data can be useful when choosing an image id to pass to the <tt>knife rackspace server create</tt> subcommand.
+Outputs a list of all available images available to the currently configured Rackspace Cloud account. An image is a collection of files used to create or rebuild a server. Rackspace provides a number of pre-built OS images by default. This data can be useful when choosing an image id to pass to the <tt>knife rackspace server create</tt> subcommand.
 
 
 = LICENSE:
 
 Author:: Adam Jacob (<adam@opscode.com>)
 Author:: Seth Chisamore (<schisamo@opscode.com>)
-Copyright:: Copyright (c) 2009-2011 Opscode, Inc.
+Copyright:: Copyright (c) 2009-2012 Opscode, Inc.
 License:: Apache License, Version 2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");

data/knife-rackspace.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.name        = "knife-rackspace"
   s.version     = Knife::Rackspace::VERSION
   s.has_rdoc = true
-  s.authors     = ["Adam Jacob","Seth Chisamore"]
-  s.email       = ["adam@opscode.com","schisamo@opscode.com"]
+  s.authors     = ["Adam Jacob","Seth Chisamore", "Matt Ray"]
+  s.email       = ["adam@opscode.com","schisamo@opscode.com", "matt@opscode.com"]
   s.homepage = "http://wiki.opscode.com/display/chef"
   s.summary = "Rackspace Support for Chef's Knife Command"
   s.description = s.summary
@@ -16,7 +16,8 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.add_dependency "fog", "~> 0.8.2"
+  s.add_dependency "fog", "~> 1.3"
+  s.add_dependency "chef", ">= 0.10.10"
   s.require_paths = ["lib"]
 
 end

data/lib/chef/knife/rackspace_flavor_list.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Copyright:: Copyright (c) 2011 Opscode, Inc.
+# Copyright:: Copyright (c) 2011-2012 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,13 +27,12 @@ class Chef
       banner "knife rackspace flavor list (options)"
 
       def run
-        flavor_list = [ 
+        flavor_list = [
           ui.color('ID', :bold),
           ui.color('Name', :bold),
           ui.color('Architecture', :bold),
           ui.color('RAM', :bold),
-          ui.color('Disk', :bold),
-          ui.color('Cores', :bold)
+          ui.color('Disk', :bold)
         ]
         connection.flavors.sort_by(&:id).each do |flavor|
           flavor_list << flavor.id.to_s
@@ -41,9 +40,8 @@ class Chef
           flavor_list << "#{flavor.bits.to_s}-bit"
           flavor_list << "#{flavor.ram.to_s}"
           flavor_list << "#{flavor.disk.to_s} GB"
-          flavor_list << flavor.cores.to_s
         end
-        puts ui.list(flavor_list, :columns_across, 6)
+        puts ui.list(flavor_list, :uneven_columns_across, 5)
       end
     end
   end

data/lib/chef/knife/rackspace_image_list.rb

@@ -37,7 +37,7 @@ class Chef
           image_list << image.name
         end
 
-        puts ui.list(image_list, :columns_across, 2)
+        puts ui.list(image_list, :uneven_columns_across, 2)
       end
     end
   end

data/lib/chef/knife/rackspace_server_create.rb

@@ -85,9 +85,9 @@ class Chef
       option :distro,
         :short => "-d DISTRO",
         :long => "--distro DISTRO",
-        :description => "Bootstrap a distro using a template; default is 'ubuntu10.04-gems'",
+        :description => "Bootstrap a distro using a template; default is 'chef-full'",
         :proc => Proc.new { |d| Chef::Config[:knife][:distro] = d },
-        :default => "ubuntu10.04-gems"
+        :default => "chef-full"
 
       option :template_file,
         :long => "--template-file TEMPLATE",
@@ -101,6 +101,13 @@ class Chef
         :description => "Comma separated list of roles/recipes to apply",
         :proc => lambda { |o| o.split(/[\s,]+/) },
         :default => []
+        
+      option :first_boot_attributes,
+        :short => "-j JSON_ATTRIBS",
+        :long => "--json-attributes",
+        :description => "A JSON string to be added to the first run of chef-client",
+        :proc => lambda { |o| JSON.parse(o) },
+        :default => {}
 
       option :rackspace_metadata,
         :short => "-M JSON",
@@ -192,6 +199,7 @@ class Chef
         bootstrap = Chef::Knife::Bootstrap.new
         bootstrap.name_args = [public_dns_name(server)]
         bootstrap.config[:run_list] = config[:run_list]
+        bootstrap.config[:first_boot_attributes] = config[:first_boot_attributes]
         bootstrap.config[:ssh_user] = config[:ssh_user] || "root"
         bootstrap.config[:ssh_password] = server.password
         bootstrap.config[:identity_file] = config[:identity_file]

data/lib/chef/knife/rackspace_server_list.rb

@@ -56,7 +56,7 @@ class Chef
             end
           end
         end
-        puts ui.list(server_list, :columns_across, 7)
+        puts ui.list(server_list, :uneven_columns_across, 7)
 
       end
     end

data/lib/knife-rackspace/version.rb

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

metadata

@@ -1,43 +1,53 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: knife-rackspace
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.5.14
   prerelease: 
-  version: 0.5.12
 platform: ruby
-authors: 
+authors:
 - Adam Jacob
 - Seth Chisamore
+- Matt Ray
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-15 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-15 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fog
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70301854701640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.8.2
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *70301854701640
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: &70301854701140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.10
+  type: :runtime
+  prerelease: false
+  version_requirements: *70301854701140
 description: Rackspace Support for Chef's Knife Command
-email: 
+email:
 - adam@opscode.com
 - schisamo@opscode.com
+- matt@opscode.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - LICENSE
-files: 
+files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -50,33 +60,28 @@ files:
 - lib/chef/knife/rackspace_server_delete.rb
 - lib/chef/knife/rackspace_server_list.rb
 - lib/knife-rackspace/version.rb
-has_rdoc: true
 homepage: http://wiki.opscode.com/display/chef
 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.17
 signing_key: 
 specification_version: 3
 summary: Rackspace Support for Chef's Knife Command
 test_files: []
-