chef 0.8.16 → 0.9.0.a3

data/lib/chef/knife/ec2_server_create.rb

@@ -0,0 +1,146 @@
+#
+# Author:: Adam Jacob (<adam@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.
+#
+
+require 'chef/knife'
+require 'json'
+
+class Chef
+  class Knife
+    class Ec2ServerCreate < Knife
+
+      banner "Sub-Command: ec2 server create [RUN LIST...] (options)"
+
+      option :flavor,
+        :short => "-f FLAVOR",
+        :long => "--flavor FLAVOR",
+        :description => "The flavor of server (m1.small, m1.medium, etc)",
+        :default => "m1.small"
+
+      option :image,
+        :short => "-i IMAGE",
+        :long => "--image IMAGE",
+        :description => "The AMI for the server"
+
+      option :security_groups,
+        :short => "-G X,Y,Z",
+        :long => "--groups X,Y,Z",
+        :description => "The security groups for this server",
+        :default => ["default"],
+        :proc => Proc.new { |groups| groups.split(',') }
+
+      option :availability_zone,
+        :short => "-Z ZONE",
+        :long => "--availability-zone ZONE",
+        :description => "The Availability Zone",
+        :default => "us-east-1b"
+
+      option :ssh_key_name,
+        :short => "-S KEY",
+        :long => "--ssh-key KEY",
+        :description => "The SSH root key",
+        :proc => Proc.new { |key| Chef::Config[:knife][:aws_ssh_key_id] = key }
+
+      option :ssh_user,
+        :short => "-x USERNAME",
+        :long => "--ssh-user USERNAME",
+        :description => "The ssh username",
+        :default => "root" 
+
+      option :aws_access_key_id,
+        :short => "-A ID",
+        :long => "--aws-access-key-id KEY",
+        :description => "Your AWS Access Key ID",
+        :proc => Proc.new { |key| Chef::Config[:knife][:aws_access_key_id] = key } 
+
+      option :aws_secret_access_key,
+        :short => "-K SECRET",
+        :long => "--aws-secret-access-key SECRET",
+        :description => "Your AWS API Secret Access Key",
+        :proc => Proc.new { |key| Chef::Config[:knife][:aws_secret_access_key] = key } 
+
+      def h
+        @highline ||= HighLine.new
+      end
+
+      def run 
+        require 'fog'
+        require 'highline'
+        require 'net/ssh/multi'
+        require 'readline'
+
+        $stdout.sync = true
+
+        connection = Fog::AWS::EC2.new(
+          :aws_access_key_id => Chef::Config[:knife][:aws_access_key_id],
+          :aws_secret_access_key => Chef::Config[:knife][:aws_secret_access_key]
+        )
+
+        server = connection.servers.create(
+          :image_id => config[:image],
+          :groups => config[:security_groups],
+          :flavor_id => config[:flavor],
+          :key_name => Chef::Config[:knife][:aws_ssh_key_id],
+          :availability_zone => config[:availability_zone]
+        )
+
+        puts "#{h.color("Instance ID", :cyan)}: #{server.id}"
+        puts "#{h.color("Flavor", :cyan)}: #{server.flavor_id}"
+        puts "#{h.color("Image", :cyan)}: #{server.image_id}"
+        puts "#{h.color("Availability Zone", :cyan)}: #{server.availability_zone}"
+        puts "#{h.color("Security Groups", :cyan)}: #{server.groups.join(", ")}"
+        puts "#{h.color("SSH Key", :cyan)}: #{server.key_name}"
+     
+        print "\n#{h.color("Waiting for server", :magenta)}"
+
+        # wait for it to be ready to do stuff
+        server.wait_for { print "."; ready? }
+
+        print "\n\n"
+
+        puts "#{h.color("Public DNS Name", :cyan)}: #{server.dns_name}"
+        puts "#{h.color("Public IP Address", :cyan)}: #{server.ip_address}"
+        puts "#{h.color("Private DNS Name", :cyan)}: #{server.private_dns_name}"
+        puts "#{h.color("Private IP Address", :cyan)}: #{server.private_ip_address}"
+
+        puts "\nWaiting 15 seconds for SSH...\n"
+
+        sleep 15
+
+        bootstrap = Chef::Knife::Bootstrap.new
+        bootstrap.name_args = [ server.ip_address, @name_args ].flatten
+        bootstrap.config[:ssh_user] = config[:ssh_user] 
+        bootstrap.config[:chef_node_name] = server.id
+        bootstrap.run
+
+        puts "\n"
+        puts "#{h.color("Instance ID", :cyan)}: #{server.id}"
+        puts "#{h.color("Flavor", :cyan)}: #{server.flavor_id}"
+        puts "#{h.color("Image", :cyan)}: #{server.image_id}"
+        puts "#{h.color("Availability Zone", :cyan)}: #{server.availability_zone}"
+        puts "#{h.color("Security Groups", :cyan)}: #{server.groups.join(", ")}"
+        puts "#{h.color("SSH Key", :cyan)}: #{server.key_name}"
+        puts "#{h.color("Public DNS Name", :cyan)}: #{server.dns_name}"
+        puts "#{h.color("Public IP Address", :cyan)}: #{server.ip_address}"
+        puts "#{h.color("Private DNS Name", :cyan)}: #{server.private_dns_name}"
+        puts "#{h.color("Private IP Address", :cyan)}: #{server.private_ip_address}"
+        puts "#{h.color("Run List", :cyan)}: #{@name_args.join(', ')}"
+      end
+    end
+  end
+end
+

data/lib/chef/knife/ec2_server_delete.rb

@@ -0,0 +1,84 @@
+#
+# 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 Ec2ServerDelete < Knife
+
+      banner "Sub-Command: ec2 server delete SERVER [SERVER] (options)"
+      
+      option :aws_access_key_id,
+        :short => "-A ID",
+        :long => "--aws-access-key-id KEY",
+        :description => "Your AWS Access Key ID",
+        :proc => Proc.new { |key| Chef::Config[:knife][:aws_access_key_id] = key } 
+
+      option :aws_secret_access_key,
+        :short => "-K SECRET",
+        :long => "--aws-secret-access-key SECRET",
+        :description => "Your AWS API Secret Access Key",
+        :proc => Proc.new { |key| Chef::Config[:knife][:aws_secret_access_key] = key } 
+
+      def h
+        @highline ||= HighLine.new
+      end
+
+      def run 
+        require 'fog'
+        require 'highline'
+        require 'net/ssh/multi'
+        require 'readline'
+
+        connection = Fog::AWS::EC2.new(
+          :aws_access_key_id => Chef::Config[:knife][:aws_access_key_id],
+          :aws_secret_access_key => Chef::Config[:knife][:aws_secret_access_key]
+        )
+
+        @name_args.each do |instance_id|
+          server = connection.servers.get(instance_id)
+
+          puts "#{h.color("Instance ID", :cyan)}: #{server.id}"
+          puts "#{h.color("Flavor", :cyan)}: #{server.flavor_id}"
+          puts "#{h.color("Image", :cyan)}: #{server.image_id}"
+          puts "#{h.color("Availability Zone", :cyan)}: #{server.availability_zone}"
+          puts "#{h.color("Security Groups", :cyan)}: #{server.groups.join(", ")}"
+          puts "#{h.color("SSH Key", :cyan)}: #{server.key_name}"
+          puts "#{h.color("Public DNS Name", :cyan)}: #{server.dns_name}"
+          puts "#{h.color("Public IP Address", :cyan)}: #{server.ip_address}"
+          puts "#{h.color("Private DNS Name", :cyan)}: #{server.private_dns_name}"
+          puts "#{h.color("Private IP Address", :cyan)}: #{server.private_ip_address}"
+
+          puts "\n"
+          confirm("Do you really want to delete this server")
+
+          server.destroy
+
+          Chef::Log.warn("Deleted server #{server.id}")
+        end
+      end
+    end
+  end
+end
+
+
+
+
+

data/lib/chef/knife/ec2_server_list.rb

@@ -0,0 +1,82 @@
+#
+# Author:: Adam Jacob (<adam@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.
+#
+
+require 'chef/knife'
+require 'json'
+
+class Chef
+  class Knife
+    class Ec2ServerList < Knife
+
+      banner "Sub-Command: ec2 server list [RUN LIST...] (options)"
+
+      option :aws_access_key_id,
+        :short => "-A ID",
+        :long => "--aws-access-key-id KEY",
+        :description => "Your AWS Access Key ID",
+        :proc => Proc.new { |key| Chef::Config[:knife][:aws_access_key_id] = key } 
+
+      option :aws_secret_access_key,
+        :short => "-K SECRET",
+        :long => "--aws-secret-access-key SECRET",
+        :description => "Your AWS API Secret Access Key",
+        :proc => Proc.new { |key| Chef::Config[:knife][:aws_secret_access_key] = key } 
+
+      def h
+        @highline ||= HighLine.new
+      end
+
+      def run 
+        require 'fog'
+        require 'highline'
+        require 'net/ssh/multi'
+        require 'readline'
+
+        $stdout.sync = true
+
+        connection = Fog::AWS::EC2.new(
+          :aws_access_key_id => Chef::Config[:knife][:aws_access_key_id],
+          :aws_secret_access_key => Chef::Config[:knife][:aws_secret_access_key]
+        )
+
+        server_list = [ 
+          h.color('Instance ID', :bold), 
+          h.color('Public IP', :bold), 
+          h.color('Private IP', :bold),
+          h.color('Flavor', :bold),
+          h.color('Image', :bold),
+          h.color('Security Groups', :bold),
+          h.color('State', :bold)
+        ]
+        connection.servers.all.each do |server|
+          server_list << server.id.to_s
+          server_list << (server.ip_address == nil ? "" : server.ip_address)
+          server_list << (server.private_ip_address == nil ? "" : server.private_ip_address) 
+          server_list << (server.flavor_id == nil ? "" : server.flavor_id)
+          server_list << (server.image_id == nil ? "" : server.image_id)
+          server_list << server.groups.join(", ")
+          server_list << server.state
+        end
+        puts h.list(server_list, :columns_across, 7)
+
+      end
+    end
+  end
+end
+
+

data/lib/chef/knife/status.rb

@@ -0,0 +1,51 @@
+#
+# Author:: Ian Meyer (<ianmmeyer@gmail.com>)
+# Copyright:: Copyright (c) 2010 Ian Meyer
+# 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 'highline'
+require 'chef/search/query'
+
+class Chef
+  class Knife
+    class Status < Knife
+
+      banner "Sub-Command: status"
+
+      def highline
+        @h ||= HighLine.new
+      end
+
+      def run
+        Chef::Search::Query.new.search(:node, '*:*') do |node|
+          current_time = DateTime.now
+          date = DateTime.parse(Time.at(node["ohai_time"]).to_s)
+          hours, minutes, seconds, frac = DateTime.day_fraction_to_time(current_time - date)
+          hours_text   = "#{hours} hour#{hours == 1 ? ' ' : 's'}"
+          minutes_text = "#{minutes} minute#{minutes == 1 ? ' ' : 's'}"
+          if hours > 24
+            highline.say("<%= color('#{hours_text}', RED) %> ago, #{node['fqdn']} checked in as a #{node['platform']} #{node['platform_version']} node.")
+          elsif hours > 1
+            highline.say("<%= color('#{hours_text}', YELLOW) %> ago, #{node['fqdn']} checked in as a #{node['platform']} #{node['platform_version']} node.")
+          elsif hours == 0
+            highline.say("<%= color('#{minutes_text}', GREEN) %> ago, #{node['fqdn']} checked in as a #{node['platform']} #{node['platform_version']} node.")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/chef/mixin/language_include_attribute.rb

@@ -22,28 +22,33 @@ class Chef
   module Mixin
     module LanguageIncludeAttribute
 
-      def include_attribute(*args)
+      # Loads the attribute file specified by the short name of the
+      # file, e.g., loads specified cookbook's
+      #   "attributes/mailservers.rb"
+      # if passed
+      #   "mailservers"
+      def include_attribute(*fully_qualified_attribute_short_filenames)
         if self.kind_of?(Chef::Node)
           node = self
         else
           node = @node
         end
 
-        args.flatten.each do |attrib|
-          if node.run_state[:seen_attributes].has_key?(attrib)
-            Chef::Log.debug("I am not loading attribute file #{attrib}, because I have already seen it.")
+        fully_qualified_attribute_short_filenames.flatten.each do |fully_qualified_attribute_short_filename|
+          if node.run_state[:seen_attributes].has_key?(fully_qualified_attribute_short_filename)
+            Chef::Log.debug("I am not loading attribute file #{fully_qualified_attribute_short_filename}, because I have already seen it.")
             next
           end
 
-          Chef::Log.debug("Loading Attribute #{attrib}")
-          node.run_state[:seen_attributes][attrib] = true
+          Chef::Log.debug("Loading Attribute #{fully_qualified_attribute_short_filename}")
+          node.run_state[:seen_attributes][fully_qualified_attribute_short_filename] = true
 
-          if amatch = attrib.match(/(.+?)::(.+)/)
-            cookbook = @cookbook_loader[amatch[1].to_sym]
-            cookbook.load_attribute(amatch[2], node)
+          if amatch = fully_qualified_attribute_short_filename.match(/(.+?)::(.+)/)
+            cookbook_name = amatch[1].to_sym
+            node.load_attribute_by_short_filename(amatch[2], cookbook_name)
           else
-            cookbook = @cookbook_loader[amatch[1].to_sym]
-            cookbook.load_attribute("default", node)
+            cookbook_name = fully_qualified_attribute_short_filename.to_sym
+            node.load_attribute_by_short_filename("default", cookbook_name)
           end
         end
         true

data/lib/chef/mixin/language_include_recipe.rb

@@ -22,25 +22,24 @@ class Chef
   module Mixin
     module LanguageIncludeRecipe
 
-      def include_recipe(*args)
-        args.flatten.each do |recipe|
-          if @node.run_state[:seen_recipes].has_key?(recipe)
-            Chef::Log.debug("I am not loading #{recipe}, because I have already seen it.")
+      def include_recipe(*recipe_names)
+        result_recipes = Array.new
+        recipe_names.flatten.each do |recipe_name|
+          if node.run_state[:seen_recipes].has_key?(recipe_name)
+            Chef::Log.debug("I am not loading #{recipe_name}, because I have already seen it.")
             next
-          end        
-
-          Chef::Log.debug("Loading Recipe #{recipe} via include_recipe")
-          @node.run_state[:seen_recipes][recipe] = true
-
-          rmatch = recipe.match(/(.+?)::(.+)/)
-          if rmatch
-            cookbook = @cookbook_loader[rmatch[1]]
-            cookbook.load_recipe(rmatch[2], @node, @collection, @definitions, @cookbook_loader)
-          else
-            cookbook = @cookbook_loader[recipe]
-            cookbook.load_recipe("default", @node, @collection, @definitions, @cookbook_loader)
           end
+
+          Chef::Log.debug("Loading Recipe #{recipe_name} via include_recipe")
+          node.run_state[:seen_recipes][recipe_name] = true
+
+          cookbook_name, recipe_short_name = Chef::Recipe.parse_recipe_name(recipe_name)
+
+          run_context = self.is_a?(Chef::RunContext) ? self : self.run_context
+          cookbook = run_context.cookbook_collection[cookbook_name]
+          result_recipes << cookbook.load_recipe(recipe_short_name, run_context)
         end
+        result_recipes
       end
 
       def require_recipe(*args)