chef 0.8.10 → 0.8.14

data/lib/chef/knife/data_bag_edit.rb

@@ -38,7 +38,7 @@ class Chef
 
           Chef::Log.info("Saved data_bag_item[#{@name_args[1]}]")
 
-          json_pretty_print(format_for_display(object)) if config[:print_after]
+          output(format_for_display(object)) if config[:print_after]
         end
       end
     end

data/lib/chef/knife/data_bag_list.rb

@@ -30,8 +30,8 @@ class Chef
         :long => "--with-uri",
         :description => "Show corresponding URIs"
 
-      def run 
-        json_pretty_print(format_list_for_display(Chef::DataBag.list))
+      def run
+        output(format_list_for_display(Chef::DataBag.list))
       end
     end
   end

data/lib/chef/knife/data_bag_show.rb

@@ -32,7 +32,7 @@ class Chef
                   else
                     format_list_for_display(Chef::DataBag.load(@name_args[0]))
                   end
-        json_pretty_print(display)
+        output(display)
       end
     end
   end

data/lib/chef/knife/ec2_instance_data.rb

@@ -38,7 +38,7 @@ class Chef
           "attributes" => { "run_list" => @name_args } 
         }
         data = edit_data(data) if config[:edit]
-        json_pretty_print(data)
+        output(data)
       end
     end
   end

data/lib/chef/knife/index_rebuild.rb

@@ -32,7 +32,7 @@ class Chef
         
       def run
         nag
-        json_pretty_print rest.post_rest("/search/reindex", {})
+        output rest.post_rest("/search/reindex", {})
       end
       
       def nag
@@ -48,4 +48,4 @@ class Chef
       
     end
   end
-end
+end

data/lib/chef/knife/node_from_file.rb

@@ -31,7 +31,7 @@ class Chef
 
         updated.save
         
-        json_pretty_print(format_for_display(updated)) if config[:print_after]
+        output(format_for_display(updated)) if config[:print_after]
 
         Chef::Log.warn("Updated Node #{updated.name}!")
       end

data/lib/chef/knife/node_list.rb

@@ -31,8 +31,8 @@ class Chef
         :long => "--with-uri",
         :description => "Show corresponding URIs"
 
-      def run 
-        json_pretty_print(format_list_for_display(Chef::Node.list))
+      def run
+        output(format_list_for_display(Chef::Node.list))
       end
     end
   end

data/lib/chef/knife/node_run_list_add.rb

@@ -41,7 +41,7 @@ class Chef
 
         config[:run_list] = true
 
-        json_pretty_print(format_for_display(node)) 
+        output(format_for_display(node)) 
       end
 
       def add_to_run_list(node, new_value, after=nil)

data/lib/chef/knife/node_run_list_remove.rb

@@ -36,7 +36,7 @@ class Chef
 
         config[:run_list] = true
 
-        json_pretty_print(format_for_display(node)) 
+        output(format_for_display(node)) 
       end
 
     end

data/lib/chef/knife/node_show.rb

@@ -38,7 +38,7 @@ class Chef
 
       def run 
         node = Chef::Node.load(@name_args[0])
-        json_pretty_print(format_for_display(node))
+        output(format_for_display(node))
       end
     end
   end

data/lib/chef/knife/rackspace_server_create.rb

@@ -0,0 +1,156 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2009 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.
+#
+
+require 'chef/knife'
+require 'json'
+
+class Chef
+  class Knife
+    class RackspaceServerCreate < Knife
+
+      banner "Sub-Command: rackspace server create [RUN LIST...] (options)"
+
+      option :flavor,
+        :short => "-f FLAVOR",
+        :long => "--flavor FLAVOR",
+        :description => "The flavor of server",
+        :proc => Proc.new { |f| f.to_i },
+        :default => 1
+
+      option :image,
+        :short => "-i IMAGE",
+        :long => "--image IMAGE",
+        :description => "The image of the server",
+        :proc => Proc.new { |i| i.to_i },
+        :default => 14362
+
+      option :server_name,
+        :short => "-N NAME",
+        :long => "--server-name NAME",
+        :description => "The server name",
+        :default => "wtf"
+
+      option :api_key,
+        :short => "-K KEY",
+        :long => "--rackspace-api-key KEY",
+        :description => "Your rackspace API key",
+        :proc => Proc.new { |key| Chef::Config[:knife][:rackspace_api_key] = key } 
+
+      option :api_username,
+        :short => "-A USERNAME",
+        :long => "--rackspace-api-username USERNAME",
+        :description => "Your rackspace API username",
+        :proc => Proc.new { |username| Chef::Config[:knife][:rackspace_api_username] = username } 
+
+      def h
+        @highline ||= HighLine.new
+      end
+
+      def run 
+        require 'fog'
+        require 'highline'
+        require 'net/ssh/multi'
+        require 'readline'
+
+        connection = Fog::Rackspace::Servers.new(
+          :rackspace_api_key => Chef::Config[:knife][:rackspace_api_key],
+          :rackspace_username => Chef::Config[:knife][:rackspace_api_username] 
+        )
+
+        server = connection.servers.new
+       
+        server.flavor_id = config[:flavor]
+        server.image_id = config[:image]
+        server.name = config[:server_name]
+        server.personality = [
+          { 
+            'path' => '/etc/install-chef',
+            'contents' => <<-EOH
+#!/bin/bash
+# Customized rc.local for chef installation
+
+if [ ! -f /usr/bin/chef-client ]; then
+  apt-get update
+  apt-get install -y ruby ruby1.8-dev build-essential wget libruby-extras libruby1.8-extras
+  cd /tmp
+  wget http://rubyforge.org/frs/download.php/69365/rubygems-1.3.6.tgz
+  tar xvf rubygems-1.3.6.tgz
+  cd rubygems-1.3.6
+  ruby setup.rb
+  cp /usr/bin/gem1.8 /usr/bin/gem
+  gem install chef ohai --no-rdoc --no-ri --verbose
+fi
+
+exit 0
+EOH
+          },
+          { 
+            'path' => "/etc/chef/validation.pem",
+            'contents' => IO.read(Chef::Config[:validation_key])
+          },
+          { 
+            'path' => "/etc/chef/client.rb",
+            'contents' => <<-EOH
+log_level        :info
+log_location     STDOUT
+chef_server_url  "#{Chef::Config[:chef_server_url]}" 
+validation_client_name "#{Chef::Config[:validation_client_name]}"
+EOH
+          },
+          {
+            'path' => "/etc/chef/first-boot.json",
+            'contents' => { "run_list" => @name_args }.to_json
+          },
+        ]
+
+        server.save
+
+        $stdout.sync = true
+
+        puts "#{h.color("Name", :cyan)}: #{server.name}"
+        puts "#{h.color("Flavor", :cyan)}: #{server.flavor_id}"
+        puts "#{h.color("Image", :cyan)}: #{server.image_id}"
+        puts "#{h.color("Public Address", :cyan)}: #{server.addresses["public"]}"
+        puts "#{h.color("Private Address", :cyan)}: #{server.addresses["private"]}"
+        puts "#{h.color("Password", :cyan)}: #{server.password}"
+     
+        print "\n#{h.color("Requesting server", :magenta)}"
+        saved_password = server.password
+
+        # wait for it to be ready to do stuff
+        server.wait_for { print "."; ready? }
+
+        puts "\nServer ready, waiting 15 seconds to bootstrap."
+        sleep 15
+
+        puts "\nBootstrapping #{h.color(server.name, :bold)}..."
+
+        ssh = Chef::Knife::Ssh.new
+        ssh.name_args = [ server.addresses["public"][0], "/bin/bash /etc/install-chef && /usr/bin/chef-client -j /etc/chef/first-boot.json" ]
+        ssh.config[:ssh_user] = "root"
+        ssh.config[:manual] = true
+        ssh.config[:password] = saved_password
+        ssh.password = saved_password
+        ssh.run
+
+      end
+    end
+  end
+end
+
+

data/lib/chef/knife/rackspace_server_delete.rb

@@ -0,0 +1,57 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2009 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.
+#
+
+require 'chef/knife'
+require 'json'
+
+class Chef
+  class Knife
+    class RackspaceServerDelete < Knife
+
+      banner "Sub-Command: rackspace server delete SERVER (options)"
+
+      def h
+        @highline ||= HighLine.new
+      end
+
+      def run 
+        require 'fog'
+        require 'highline'
+        require 'net/ssh/multi'
+        require 'readline'
+
+        connection = Fog::Rackspace::Servers.new(
+          :rackspace_api_key => Chef::Config[:knife][:rackspace_api_key],
+          :rackspace_username => Chef::Config[:knife][:rackspace_api_username] 
+        )
+
+        server = connection.servers.get(@name_args[0])
+
+        confirm("Do you really want to delete server ID #{server.id} named #{server.name}")
+
+        server.destroy
+
+        Chef::Log.warn("Deleted server #{server.id} named #{server.name}")
+      end
+    end
+  end
+end
+
+
+
+

data/lib/chef/knife/rackspace_server_list.rb

@@ -0,0 +1,59 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2009 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.
+#
+
+require 'chef/knife'
+require 'json'
+
+class Chef
+  class Knife
+    class RackspaceServerList < Knife
+
+      banner "Sub-Command: rackspace server list (options)"
+
+      def h
+        @highline ||= HighLine.new
+      end
+
+      def run 
+        require 'fog'
+        require 'highline'
+        require 'net/ssh/multi'
+        require 'readline'
+
+        connection = Fog::Rackspace::Servers.new(
+          :rackspace_api_key => Chef::Config[:knife][:rackspace_api_key],
+          :rackspace_username => Chef::Config[:knife][:rackspace_api_username] 
+        )
+
+        server_list = [ h.color('ID', :bold), h.color('Name', :bold), h.color('Public IP', :bold), h.color('Private IP', :bold), h.color('Flavor ID', :bold) ]
+        connection.servers.all.each do |server|
+          server_list << server.id.to_s
+          server_list << server.name
+          server_list << server.addresses["public"][0]
+          server_list << server.addresses["private"][0]
+          server_list << server.flavor_id.to_s
+        end
+        puts h.list(server_list, :columns_across, 5)
+
+      end
+    end
+  end
+end
+
+
+

data/lib/chef/knife/role_from_file.rb

@@ -31,7 +31,7 @@ class Chef
 
         updated.save
         
-        json_pretty_print(format_for_display(updated)) if config[:print_after]
+        output(format_for_display(updated)) if config[:print_after]
 
         Chef::Log.warn("Updated Role #{updated.name}!")
       end

data/lib/chef/knife/role_list.rb

@@ -32,7 +32,7 @@ class Chef
         :description => "Show corresponding URIs"
 
       def run 
-        json_pretty_print(format_list_for_display(Chef::Role.list))
+        output(format_list_for_display(Chef::Role.list))
       end
     end
   end

data/lib/chef/knife/role_show.rb

@@ -33,7 +33,7 @@ class Chef
 
       def run 
         role = Chef::Role.load(@name_args[0])
-        json_pretty_print(format_for_display(role))
+        output(format_for_display(role))
       end
 
     end

data/lib/chef/knife/search.rb

@@ -82,7 +82,7 @@ class Chef
             puts display[:rows].join("\n") 
           end
         else
-          json_pretty_print(display)
+          output(display)
         end
       end
     end

data/lib/chef/knife/ssh.rb

@@ -23,6 +23,8 @@ class Chef
   class Knife
     class Ssh < Knife
 
+      attr_writer :password
+
       banner "Sub-Command: ssh QUERY COMMAND (options)"
 
       option :concurrency,
@@ -44,11 +46,20 @@ class Chef
         :description => "QUERY is a space separated list of servers",
         :default => false
 
+      option :ssh_user,
+        :short => "-x USERNAME",
+        :long => "--ssh-user USERNAME",
+        :description => "The ssh username"
+
+      option :ssh_password,
+        :short => "-P PASSWORD",
+        :long => "--ssh-password PASSWORD",
+        :description => "The ssh password"
+
       def session
         @session ||= Net::SSH::Multi.start(:concurrent_connections => config[:concurrency])
       end
 
-
       def h
         @highline ||= HighLine.new
       end
@@ -71,7 +82,12 @@ class Chef
       def session_from_list(list)
         list.each do |item|
           Chef::Log.debug("Adding #{item}")
-          session.use item 
+         
+          if config[:password]
+            session.use config[:ssh_user] ? "#{config[:ssh_user]}@#{item}" : item, :password => config[:password]
+          else
+            session.use config[:ssh_user] ? "#{config[:ssh_user]}@#{item}" : item
+          end
           @longest = item.length if item.length > @longest
         end
         session
@@ -173,8 +189,9 @@ class Chef
         tf.puts("caption always '%w'")
         tf.puts("hardstatus alwayslastline 'knife ssh #{@name_args[0]}'")
         window = 0
-        session.servers_for.collect { |s| s.host }.each do |server|
-          tf.puts("screen -t \"#{server}\" #{window} ssh #{server}")
+        session.servers_for.each do |server|
+          tf.print("screen -t \"#{server.host}\" #{window} ssh ")
+          server.user ? tf.puts("#{server.user}@#{server.host}") : tf.puts(server.host)
           window += 1
         end
         tf.close