knife-bluebox 0.7.1 → 0.8.0

data/README.rdoc

@@ -15,9 +15,18 @@ Set the following environmental variables
 export BLUEBOX_API_KEY="YourAPIKey"              # should match /[a-f0-9]+/
 export BLUEBOX_CUSTOMER_ID="YourCustomerNumber"  # should match /d+/
 
+Then add the following lines to <chef-repo-root>/.chef/knife.rb
+
+# API credentials for knife-bluebox
+knife[:bluebox_customer_id] = ENV['BLUEBOX_CUSTOMER_ID']
+knife[:bluebox_api_key]     = ENV['BLUEBOX_API_KEY']
+knife[:identity_file]       = "#{ENV['HOME']}/.ssh/id_rsa"
+knife[:public_identity_file] = "#{ENV['HOME']}/.ssh/id_rsa.pub"
+
 == Usage
 knife bluebox images list
 knife bluebox server create [RUN LIST...] (options)
 knife bluebox server delete BLOCK-HOSTNAME
 knife bluebox server list (options)
 
+You will need to run knife from within your chef-repo to have the knife.rb config take effect.

data/lib/chef/knife/bluebox_image_create.rb

@@ -0,0 +1,66 @@
+#
+# Author:: Jesse Proudman (<jesse.proudman@blueboxgrp.com>)
+# Copyright:: Copyright (c) 2010 Blue Box Group
+# 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'
+
+class Chef
+  class Knife
+    class BlueboxImageCreate < Knife
+
+      deps do
+        require 'fog'
+        require 'highline'
+        require 'chef/json_compat'
+      end
+
+      banner "knife bluebox image create [uuid]"
+
+      option :description,
+        :short => '-d DESCRIPTION',
+        :long  => '--description DESCRIPTION',
+        :description => 'The description to give the created image. Defaults to Hostname and Timestamp'
+
+      option :public,
+        :short => '-p',
+        :long  => '--public',
+        :description => 'Makes the image public so that anyone can deploy from it',
+        :boolean => true
+
+      def highline
+        @highline ||= HighLine.new
+      end
+
+      def run
+        bluebox,image,create = ARGV.shift, ARGV.shift, ARGV.shift
+        bluebox = Fog::Compute::Bluebox.new(
+          :bluebox_customer_id => Chef::Config[:knife][:bluebox_customer_id],
+          :bluebox_api_key => Chef::Config[:knife][:bluebox_api_key]
+        )
+
+        config[:public] ||= false
+        config[:block_id] ||= ARGV.shift
+
+        image = bluebox.images.new(config)
+
+        response = image.save
+
+        puts response
+      end
+    end
+  end
+end

data/lib/chef/knife/bluebox_image_delete.rb

@@ -0,0 +1,55 @@
+#
+# Author:: Jesse Proudman (<jesse.proudman@blueboxgrp.com>)
+# Copyright:: Copyright (c) 2010 Blue Box Group
+# 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'
+
+class Chef
+  class Knife
+    class BlueboxImageDelete < Knife
+
+      deps do
+        require 'fog'
+        require 'highline'
+        require 'chef/json_compat'
+      end
+
+      banner "knife bluebox image delete [UUID]"
+
+      def highline
+        @highline ||= HighLine.new
+      end
+
+      def run
+        bluebox,image,delete = ARGV.shift, ARGV.shift, ARGV.shift
+        bluebox = Fog::Compute::Bluebox.new(
+          :bluebox_customer_id => Chef::Config[:knife][:bluebox_customer_id],
+          :bluebox_api_key => Chef::Config[:knife][:bluebox_api_key]
+        )
+        image_uuid = ARGV.shift
+
+        image = bluebox.images.get( image_uuid )
+
+        if image
+          puts image.destroy
+        else
+          ui.error("Image: #{image_uuid} could not be found")
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/{bluebox_images_list.rb → bluebox_image_list.rb}

@@ -6,9 +6,9 @@
 # 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.
@@ -20,7 +20,7 @@ require 'chef/knife'
 
 class Chef
   class Knife
-    class BlueboxImagesList < Knife
+    class BlueboxImageList < Knife
 
       deps do
         require 'fog'
@@ -28,7 +28,7 @@ class Chef
         require 'chef/json_compat'
       end
 
-      banner "knife bluebox images list"
+      banner "knife bluebox image list"
 
       def highline
         @highline ||= HighLine.new
@@ -44,9 +44,9 @@ class Chef
 
         image_list = [ highline.color('ID', :bold), highline.color('Name', :bold) ]
 
-        bluebox.images.each do |server|
-          image_list << server.id.to_s
-          image_list << server.description
+        bluebox.images.each do |image|
+          image_list << image.id.to_s
+          image_list << image.description
         end
         puts highline.list(image_list, :columns_across, 2)
 

data/lib/chef/knife/bluebox_server_create.rb

@@ -60,8 +60,7 @@ class Chef
       option :password,
         :short => "-P password",
         :long => "--password password",
-        :description => "User password on new server.",
-        :default => ""
+        :description => "User password on new server."
 
       option :disable_bootstrap,
         :long => "--disable-bootstrap",
@@ -76,8 +75,13 @@ class Chef
 
       option :identity_file,
         :short => "-I IDENTITY_FILE",
-        :long => "--identity-file IDENTITY_FILE",
-        :description => "The SSH identity file used for authentication"
+        :long => "--identity-file PRIVATE_IDENTITY_FILE",
+        :description => "The private SSH identity file used for authentication to the new server"
+
+      option :public_identity_file,
+        :short => "-B PUBLIC_IDENTITY_FILE",
+        :long => "--public-identity-file PUBLIC_IDENTITY_FILE",
+        :description => "The public SSH identity file used for authentication to new server"      
 
       option :load_balancer,
         :short => "-b LB",
@@ -96,12 +100,20 @@ class Chef
       def run
         $stdout.sync = true
 
-        if Chef::Config[:knife][:identity_file].nil? && config[:identity_file].nil?
-          ui.error('You have not provided a SSH identity file. This is required to create a Blue Box server.')
-          exit 1
-        elsif Chef::Config[:knife][:identity_file]
-          public_key = File.read(Chef::Config[:knife][:identity_file]).chomp
-        else public_key = File.read(config[:identity_file]).chomp
+        public_key = config[:public_identity_file] || Chef::Config[:knife][:public_identity_file]
+        identity_file = config[:identity_file] || Chef::Config[:knife][:identity_file]
+
+        if config[:password].nil?
+
+          if !public_key
+            ui.error('Since no password was provided a public_identity_file needs to be set.')
+            exit 1
+          end
+
+          if !identity_file
+            ui.error('Since no password was provided an identity_file needs to be set.')
+            exit 1
+          end
         end
 
         bluebox = Fog::Compute::Bluebox.new(
@@ -120,7 +132,7 @@ class Chef
           :hostname => config[:chef_node_name],
           :username => Chef::Config[:knife][:username] || config[:username],
           :password => config[:password],
-          :public_key => public_key,
+          :public_key => File.read(public_key),
           :lb_applications => Chef::Config[:knife][:load_balancer] || config[:load_balancer]
         )
 
@@ -166,13 +178,14 @@ class Chef
               bootstrap = Chef::Knife::Bootstrap.new
               bootstrap.name_args = [ server.ips[0]['address'] ]
               bootstrap.config[:run_list] = run_list
-              bootstrap.config[:password] = password unless config[:password].empty?
+              bootstrap.config[:ssh_password] = config[:password]
               bootstrap.config[:ssh_user] = config[:username]
-              bootstrap.config[:identity_file] = config[:identity_file]
+              bootstrap.config[:identity_file] = 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
+              print "\n#{h.color("Finished bootstrapping #{server.hostname}\n\n", :green)}"
             rescue Errno::ECONNREFUSED
               puts h.color("Connection refused on SSH, retrying - CTRL-C to abort")
               sleep 1

data/lib/knife-bluebox/version.rb

@@ -1,3 +1,3 @@
 module KnifeBlueBox
-  VERSION = "0.7.1"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-bluebox
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2013-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -54,7 +54,9 @@ extra_rdoc_files:
 files:
 - LICENSE
 - README.rdoc
-- lib/chef/knife/bluebox_images_list.rb
+- lib/chef/knife/bluebox_image_create.rb
+- lib/chef/knife/bluebox_image_delete.rb
+- lib/chef/knife/bluebox_image_list.rb
 - lib/chef/knife/bluebox_server_create.rb
 - lib/chef/knife/bluebox_server_delete.rb
 - lib/chef/knife/bluebox_server_list.rb