knife-bluebox 0.5.0 → 0.5.7

data/README.rdoc

@@ -1,6 +1,6 @@
-= Knife BlueBox
-This is the official Opscode Knife plugin for BlueBox[http://www.bluebox.new].
-This plugin gives knife the ability to create, bootstrap, and manage BlueBox
+= Knife Blue Box
+This is the official Opscode Knife plugin for {Blue Box}[http://www.bluebox.net].
+This plugin gives knife the ability to create, bootstrap, and manage Blue Box
 servers.
 
 == Installation

data/lib/chef/knife/bluebox_images_list.rb

@@ -25,6 +25,12 @@ class Chef
   class Knife
     class BlueboxImagesList < Knife
 
+      deps do
+        require 'fog'
+        require 'highline'
+        require 'chef/json_compat'
+      end
+
       banner "knife bluebox images list"
 
       def highline
@@ -32,7 +38,8 @@ class Chef
       end
 
       def run
-        bluebox = Fog::Bluebox::Compute.new(
+        bluebox = Fog::Compute.new(
+          :provider => 'Bluebox',
           :bluebox_customer_id => Chef::Config[:knife][:bluebox_customer_id],
           :bluebox_api_key => Chef::Config[:knife][:bluebox_api_key]
         )

data/lib/chef/knife/bluebox_server_create.rb

@@ -16,15 +16,23 @@
 # limitations under the License.
 #
 
-require 'fog'
 require 'chef/knife'
-require 'chef/knife/bootstrap'
-require 'chef/json_compat'
 
 class Chef
   class Knife
     class BlueboxServerCreate < Knife
 
+      deps do
+        require 'chef/knife/bootstrap'
+        Chef::Knife::Bootstrap.load_deps
+        require 'fog'
+        require 'socket'
+        require 'net/ssh/multi'
+        require 'readline'
+        require 'highline'
+        require 'chef/json_compat'
+      end
+
       banner "knife bluebox server create [RUN LIST...] (options)"
 
       option :flavor,
@@ -33,6 +41,11 @@ class Chef
         :description => "The flavor of server",
         :default => "94fd37a7-2606-47f7-84d5-9000deda52ae"
 
+      option :chef_node_name,
+        :short => "-N NAME",
+        :long => "--node-name NAME",
+        :description => "The Chef node name for your new node"
+
       option :image,
         :short => "-i IMAGE",
         :long => "--image IMAGE",
@@ -56,6 +69,27 @@ class Chef
         :description => "Disables the bootstrapping process.",
         :default => true
 
+      option :distro,
+        :short => "-d DISTRO",
+        :long => "--distro DISTRO",
+        :description => "Bootstrap a distro using a template",
+        :default => "ubuntu10.04-gems"
+
+      option :identity_file,
+        :short => "-I IDENTITY_FILE",
+        :long => "--identity-file IDENTITY_FILE",
+        :description => "The SSH identity file used for authentication"
+
+      option :load_balancer,
+        :short => "-b LB",
+        :long => "--load_balancer LB",
+        :description => "Adds server to the specified load balanced application."
+
+      option :block_startup_timeout,
+        :long => "--block_startup_timeout TIME",
+        :description => "Amount of time fog should wait before aborting server deployment.",
+        :default => 10 * 60
+
       def h
         @highline ||= HighLine.new
       end
@@ -67,22 +101,24 @@ class Chef
         require 'readline'
         require 'erb'
 
-        bluebox = Fog::Bluebox::Compute.new(
+        bluebox = Fog::Compute.new(
+          :provider => 'Bluebox',
           :bluebox_customer_id => Chef::Config[:knife][:bluebox_customer_id],
           :bluebox_api_key => Chef::Config[:knife][:bluebox_api_key]
         )
 
-         flavors = bluebox.flavors.inject({}) { |h,f| h[f.id] = f.description; h }
+        flavors = bluebox.flavors.inject({}) { |h,f| h[f.id] = f.description; h }
         images  = bluebox.images.inject({}) { |h,i| h[i.id] = i.description; h }
 
         puts "#{h.color("Deploying a new Blue Box Block...", :green)}\n\n"
         server_args = {
           :flavor_id => config[:flavor],
           :image_id => config[:image],
-          :user => config[:username],
-          :password => config[:password]
+          :username => config[:username],
+          :password => config[:password],
+          :lb_applications => config[:load_balancer]
           }
-        server_args[:ssh_key] = Chef::Config[:knife][:ssh_key] if Chef::Config[:knife][:ssh_key]
+        server_args[:public_key] = Chef::Config[:knife][:ssh_key] if Chef::Config[:knife][:ssh_key]
 
         server = bluebox.servers.new(server_args)
         response = server.save
@@ -92,23 +128,24 @@ class Chef
         begin
 
           # Make sure we could properly queue the server for creation on BBG.
-          raise Fog::Bluebox::BlockInstantiationError if server.status != "queued"
+          raise Fog::Compute::Bluebox::BlockInstantiationError if server.state != "queued"
           puts "#{h.color("Hostname", :cyan)}: #{server.hostname}"
-          puts "#{h.color("Server Status", :cyan)}: #{server.status.capitalize}"
+          puts "#{h.color("Server Status", :cyan)}: #{server.state.capitalize}"
           puts "#{h.color("Flavor", :cyan)}: #{flavors[server.flavor_id]}"
           puts "#{h.color("Image", :cyan)}: #{images[server.image_id]}"
           puts "#{h.color("IP Address", :cyan)}: #{server.ips[0]['address']}"
+          puts "#{h.color("Load Balanced Applications", :cyan)}: #{server.lb_applications.collect { |x| x['lb_application_name'] }.join(", ")}" unless server.lb_applications.empty?
 
           # The server was succesfully queued... Now wait for it to spin up...
           print "\n#{h.color("Requesting status of #{server.hostname}\n", :magenta)}"
 
-          # Allow for 5 minutes to time out...
-          # ready? will raise Fog::Bluebox::BlockInstantiationError if block creation fails.
-          unless server.wait_for( 5 * 60 ){ print "."; STDOUT.flush; ready? }
+          # Define a timeout and ensure the block starts up in the specified amount of time:
+          # ready? will raise Fog::Bluebox::Compute::BlockInstantiationError if block creation fails.
+          unless server.wait_for( config[:block_startup_timeout] ){ print "."; STDOUT.flush; ready? }
 
-            # The server wasn't started in 5 minutes... Send a destroy call to make sure it doesn't spin up on us later...
+            # The server wasn't started in specified timeout ... Send a destroy call to make sure it doesn't spin up on us later.
             server.destroy
-            raise Fog::Bluebox::BlockInstantiationError, "BBG server not available after 5 minutes"
+            raise Fog::Compute::Bluebox::BlockInstantiationError, "BBG server not available after #{config[:block_startup_timeout]} seconds."
 
           else
             print "\n\n#{h.color("BBG Server startup succesful.  Accessible at #{server.hostname}\n", :green)}"
@@ -134,6 +171,7 @@ class Chef
               bootstrap.config[:identity_file] = config[:identity_file]
               bootstrap.config[:chef_node_name] = config[:chef_node_name] || server.hostname
               bootstrap.config[:use_sudo] = true
+              bootstrap.config[:distro] = config[:distro]
               bootstrap.run
             rescue Errno::ECONNREFUSED
               puts h.color("Connection refused on SSH, retrying - CTRL-C to abort")
@@ -147,7 +185,7 @@ class Chef
 
           end
 
-        rescue Fog::Bluebox::BlockInstantiationError => e
+        rescue Fog::Compute::Bluebox::BlockInstantiationError => e
 
           puts "\n\n#{h.color("Encountered error starting up BBG block. Auto destroy called.  Please try again.", :red)}"
 

data/lib/chef/knife/bluebox_server_delete.rb

@@ -16,24 +16,28 @@
 # limitations under the License.
 #
 
-require 'fog'
-require 'highline'
-require 'readline'
 require 'chef/knife'
-require 'chef/json_compat'
 
 class Chef
   class Knife
     class BlueboxServerDelete < Knife
 
+      deps do
+        require 'fog'
+        require 'highline'
+        require 'readline'
+        require 'chef/json_compat'
+      end
+
       banner "knife bluebox server delete BLOCK-HOSTNAME"
 
-    def h
+      def h
         @highline ||= HighLine.new
       end
 
       def run
-        bluebox = Fog::Bluebox::Compute.new(
+        bluebox = Fog::Compute.new(
+          :provider => 'Bluebox',
   	  :bluebox_customer_id => Chef::Config[:knife][:bluebox_customer_id],
           :bluebox_api_key => Chef::Config[:knife][:bluebox_api_key]
         )

data/lib/chef/knife/bluebox_server_list.rb

@@ -26,6 +26,13 @@ class Chef
   class Knife
     class BlueboxServerList < Knife
 
+      deps do
+        require 'fog'
+        require 'highline'
+        require 'readline'
+        require 'chef/json_compat'
+      end
+
       banner "knife bluebox server list (options)"
 
       def h
@@ -33,7 +40,8 @@ class Chef
       end
 
       def run
-        bluebox = Fog::Bluebox::Compute.new(
+        bluebox = Fog::Compute.new(
+          :provider => 'Bluebox',
   	  :bluebox_customer_id => Chef::Config[:knife][:bluebox_customer_id],
           :bluebox_api_key => Chef::Config[:knife][:bluebox_api_key]
         )

data/lib/knife-bluebox/version.rb

@@ -1,3 +1,3 @@
 module KnifeBlueBox
-  VERSION = "0.5.0"
+  VERSION = "0.5.7"
 end

metadata

@@ -1,50 +1,46 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: knife-bluebox
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.5.7
   prerelease: 
-  version: 0.5.0
 platform: ruby
-authors: 
+authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-29 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-25 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: chef
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2156629200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.14
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: fog
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2156629200
+- !ruby/object:Gem::Dependency
+  name: fog
+  requirement: &2156628360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.6.0
+      - !ruby/object:Gem::Version
+        version: 1.1.2
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *2156628360
 description: BlueBox Support for Chef's Knife Command
 email: adam@opscode.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - LICENSE
-files: 
+files:
 - LICENSE
 - README.rdoc
 - lib/chef/knife/bluebox_images_list.rb
@@ -52,33 +48,28 @@ files:
 - lib/chef/knife/bluebox_server_delete.rb
 - lib/chef/knife/bluebox_server_list.rb
 - lib/knife-bluebox/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.6
 signing_key: 
 specification_version: 3
 summary: BlueBox Support for Chef's Knife Command
 test_files: []
-