chef 0.9.12 → 0.9.14.beta.1

data/lib/chef/json.rb

@@ -0,0 +1,52 @@
+#
+# Author:: Tim Hinderliter (<tim@opscode.com>)
+# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# 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.
+
+# Wrapper class for interacting with JSON.
+
+require 'json'
+
+class Chef
+  class JSON
+    JSON_MAX_NESTING = 1000
+
+    class <<self
+      # See PL-538. Increase the max nesting for JSON, which defaults to 19,
+      # and isn't enough for some deep node (for example) structures.
+      def opts_add_max_nesting(opts)
+        if opts.nil? || !opts.has_key?(:max_nesting)
+          opts = opts.nil? ? Hash.new : opts.clone
+          opts[:max_nesting] = JSON_MAX_NESTING
+        end
+        opts
+      end
+
+      # Just call the JSON gem's parse method with a modified :max_nesting field
+      def from_json(source, opts = {})
+        ::JSON.parse(source, opts_add_max_nesting(opts))
+      end
+
+      def to_json(obj, opts = nil)
+        #::JSON.generate(obj, opts_add_max_nesting(opts))
+        obj.to_json(opts_add_max_nesting(opts))
+      end
+
+      def to_json_pretty(obj, opts = nil)
+        ::JSON.pretty_generate(obj, opts_add_max_nesting(opts))
+      end
+    end
+  end
+end

data/lib/chef/knife.rb

@@ -284,7 +284,7 @@ class Chef
     def output(data)
       case config[:format]
       when "json", nil
-        stdout.puts JSON.pretty_generate(data)
+        stdout.puts Chef::JSON.to_json_pretty(data)
       when "yaml"
         require 'yaml'
         stdout.puts YAML::dump(data)
@@ -330,7 +330,7 @@ class Chef
     end
 
     def edit_data(data, parse_output=true)
-      output = JSON.pretty_generate(data)
+      output = Chef::JSON.to_json_pretty(data)
       
       if (!config[:no_editor])
         filename = "knife-edit-"
@@ -348,7 +348,7 @@ class Chef
         File.unlink(filename)
       end
 
-      parse_output ? JSON.parse(output) : output
+      parse_output ? Chef::JSON.from_json(output) : output
     end
 
     def confirm(question, append_instructions=true)
@@ -399,7 +399,7 @@ class Chef
 
       case from_file
       when /\.(js|json)$/
-        JSON.parse(IO.read(filename))
+        Chef::JSON.from_json(IO.read(filename))
       when /\.rb$/
         r = klass.new
         r.from_file(filename)
@@ -429,8 +429,8 @@ class Chef
       # We wouldn't have to do these shenanigans if all the editable objects 
       # implemented to_hash, or if to_json against a hash returned a string 
       # with stable key order.
-      object_parsed_again = JSON.parse(object.to_json, :create_additions => false)
-      output_parsed_again = JSON.parse(output.to_json, :create_additions => false)
+      object_parsed_again = Chef::JSON.from_json(Chef::JSON.to_json(object), :create_additions => false)
+      output_parsed_again = Chef::JSON.from_json(Chef::JSON.to_json(output), :create_additions => false)
       if object_parsed_again != output_parsed_again
         output.save
         self.msg("Saved #{output}")

data/lib/chef/knife/bluebox_images_list.rb

@@ -0,0 +1,54 @@
+#
+# 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'
+require 'chef/json'
+
+class Chef
+  class Knife
+    class BlueboxImagesList < Knife
+
+      banner "knife bluebox images list"
+
+      def highline
+        @highline ||= HighLine.new
+      end
+
+      def run
+        require 'fog'
+        require 'highline'
+
+        bluebox = Fog::Bluebox::Compute.new(
+          :bluebox_customer_id => Chef::Config[:knife][:bluebox_customer_id],
+          :bluebox_api_key => Chef::Config[:knife][:bluebox_api_key]
+        )
+
+        images  = bluebox.images.inject({}) { |h,i| h[i.id] = i.description; h }
+
+        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
+        end
+        puts highline.list(image_list, :columns_across, 2)
+
+      end
+    end
+  end
+end

data/lib/chef/knife/bluebox_server_create.rb

@@ -0,0 +1,157 @@
+#
+# 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'
+require 'chef/json'
+
+class Chef
+  class Knife
+    class BlueboxServerCreate < Knife
+
+      banner "knife bluebox server create [RUN LIST...] (options)"
+
+      option :flavor,
+        :short => "-f FLAVOR",
+        :long => "--flavor FLAVOR",
+        :description => "The flavor of server",
+        :default => "94fd37a7-2606-47f7-84d5-9000deda52ae"
+
+      option :image,
+        :short => "-i IMAGE",
+        :long => "--image IMAGE",
+        :description => "The image of the server",
+        :default => "03807e08-a13d-44e4-b011-ebec7ef2c928"
+
+      option :username,
+        :short => "-U KEY",
+        :long => "--username username",
+        :description => "Username on new server",
+        :default => "deploy"
+
+      option :password,
+        :short => "-P password",
+        :long => "--password password",
+        :description => "User password on new server.",
+        :default => ""
+
+      option :bootstrap,
+        :long => "--bootstrap false",
+        :description => "Disables the bootstrapping process.",
+        :default => true
+
+      def h
+        @highline ||= HighLine.new
+      end
+
+      def run
+        require 'fog'
+        require 'highline'
+        require 'net/ssh/multi'
+        require 'readline'
+        require 'erb'
+
+        bluebox = Fog::Bluebox::Compute.new(
+          :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 }
+        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]
+          }
+        server_args[:ssh_key] = Chef::Config[:knife][:ssh_key] if Chef::Config[:knife][:ssh_key]
+
+        server = bluebox.servers.new(server_args)
+        response = server.save
+        $stdout.sync = true
+
+        # Wait for the server to start
+        begin
+
+          # Make sure we could properly queue the server for creation on BBG.
+          raise Fog::Bluebox::BlockInstantiationError if server.status != "queued"
+          puts "#{h.color("Hostname", :cyan)}: #{server.hostname}"
+          puts "#{h.color("Server Status", :cyan)}: #{server.status.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']}"
+
+          # 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? }
+
+            # The server wasn't started in 5 minutes... 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"
+
+          else
+            print "\n\n#{h.color("BBG Server startup succesful.  Accessible at #{server.hostname}\n", :green)}"
+
+            # Make sure we should be bootstrapping.
+            unless config[:bootstrap]
+              puts "\n\n#{h.color("Boostrapping disabled per command line inputs.  Exiting here.}", :green)}"
+              return true
+            end
+
+            # Bootstrap away!
+            print "\n\n#{h.color("Starting bootstrapping process...", :green)}\n"
+
+            # Connect via SSH and make this all happen.
+            begin
+              bootstrap = Chef::Knife::Bootstrap.new
+              bootstrap.name_args = [ server.ips[0]['address'] ]
+              bootstrap.config[:run_list] = @name_args
+              unless Chef::Config[:knife][:ssh_key]
+                bootstrap.config[:password] = password
+              end
+              bootstrap.config[:ssh_user] = config[:username]
+              bootstrap.config[:identity_file] = config[:identity_file]
+              bootstrap.config[:chef_node_name] = config[:chef_node_name] || server.hostname
+              bootstrap.config[:use_sudo] = true
+              bootstrap.run
+            rescue Errno::ECONNREFUSED
+              puts h.color("Connection refused on SSH, retrying - CTRL-C to abort")
+              sleep 1
+              retry
+            rescue Errno::ETIMEDOUT
+              puts h.color("Connection timed out on SSH, retrying - CTRL-C to abort")
+              sleep 1
+              retry
+            end
+
+          end
+
+        rescue Fog::Bluebox::BlockInstantiationError => e
+
+          puts "\n\n#{h.color("Encountered error starting up BBG block. Auto destroy called.  Please try again.", :red)}"
+
+        end
+
+      end
+    end
+  end
+end

data/lib/chef/knife/bluebox_server_delete.rb

@@ -0,0 +1,63 @@
+#
+# 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'
+require 'chef/json'
+
+class Chef
+  class Knife
+    class BlueboxServerDelete < Knife
+
+      banner "knife bluebox server delete BLOCK-HOSTNAME"
+
+    def h
+        @highline ||= HighLine.new
+      end
+
+      def run
+        require 'fog'
+        require 'highline'
+        require 'readline'
+
+        bluebox = Fog::Bluebox::Compute.new(
+  	  :bluebox_customer_id => Chef::Config[:knife][:bluebox_customer_id],
+          :bluebox_api_key => Chef::Config[:knife][:bluebox_api_key]
+        )
+
+        # Build hash of hostname => id
+        servers = bluebox.servers.inject({}) { |h,f| h[f.hostname] = f.id; h }
+
+        unless servers.has_key?(@name_args[0])
+          Chef::Log.warn("I can't find a block named #{@name_args[0]}")
+          return false
+        end
+
+        confirm(h.color("Do you really want to delete block UUID #{servers[@name_args[0]]} with hostname #{@name_args[0]}", :green))
+
+        begin
+          response = bluebox.destroy_block(servers[@name_args[0]])
+          if response.status == 200
+            Chef::Log.warn("Deleted server #{servers[@name_args[0]]} named #{@name_args[0]}")
+          end
+        rescue Excon::Errors::UnprocessableEntity
+          Chef::Log.warn("There was a problem deleting #{@name_args[0]}.  Please check Box Panel.")
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/bluebox_server_list.rb

@@ -0,0 +1,59 @@
+#
+# 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'
+require 'chef/json'
+
+class Chef
+  class Knife
+    class BlueboxServerList < Knife
+
+      banner "knife bluebox server list (options)"
+
+      def h
+        @highline ||= HighLine.new
+      end
+
+      def run
+        require 'fog'
+        require 'highline'
+        require 'net/ssh/multi'
+        require 'readline'
+
+        bluebox = Fog::Bluebox::Compute.new(
+  	  :bluebox_customer_id => Chef::Config[:knife][:bluebox_customer_id],
+          :bluebox_api_key => Chef::Config[:knife][:bluebox_api_key]
+        )
+
+        # Make hash of flavor id => name and image id => name
+        flavors = bluebox.flavors.inject({}) { |h,f| h[f.id] = f.description; h }
+        images  = bluebox.images.inject({}) { |h,i| h[i.id] = i.description; h }
+
+        server_list = [ h.color('ID', :bold), h.color('Hostname', :bold), h.color('IP Address', :bold) ]
+
+        bluebox.servers.each do |server|
+          server_list << server.id.to_s
+          server_list << server.hostname
+          server_list << server.ips[0]["address"]
+        end
+        puts h.list(server_list, :columns_across, 3)
+
+      end
+    end
+  end
+end

data/lib/chef/knife/bootstrap.rb

@@ -17,7 +17,7 @@
 #
 
 require 'chef/knife'
-require 'json'
+require 'chef/json'
 require 'tempfile'
 require 'erubis'
 
@@ -121,6 +121,8 @@ class Chef
 
         Chef::Log.info("Bootstrapping Chef on #{h.color(config[:server_name], :bold)}")
 
+        knife_ssh.load_late_dependencies
+
         begin
           knife_ssh.run
         rescue Net::SSH::AuthenticationFailed