chef 0.8.10 → 0.8.14

data/lib/chef/knife/terremark_server_create.rb

@@ -0,0 +1,152 @@
+#
+# 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'
+require 'tempfile'
+
+class Chef
+  class Knife
+    class TerremarkServerCreate < Knife
+
+      banner "Sub-Command: terremark server create NAME [RUN LIST...] (options)"
+
+      option :terremark_password,
+        :short => "-K PASSWORD",
+        :long => "--terremark-password PASSWORD",
+        :description => "Your terremark password",
+        :proc => Proc.new { |key| Chef::Config[:knife][:terremark_password] = key } 
+
+      option :terremark_username,
+        :short => "-A USERNAME",
+        :long => "--terremark-username USERNAME",
+        :description => "Your terremark username",
+        :proc => Proc.new { |username| Chef::Config[:knife][:terremark_username] = username } 
+
+      option :terremark_service,
+        :short => "-S SERVICE",
+        :long => "--terremark-service SERVICE",
+        :description => "Your terremark service name",
+        :proc => Proc.new { |service| Chef::Config[:knife][:terremark_service] = service } 
+
+      def h
+        @highline ||= HighLine.new
+      end
+
+      def run 
+        require 'fog'
+        require 'highline'
+        require 'net/ssh/multi'
+        require 'readline'
+        require 'net/scp'
+
+        server_name = @name_args[0]
+
+        terremark = Fog::Terremark.new(
+          :terremark_username => Chef::Config[:knife][:terremark_username],
+          :terremark_password => Chef::Config[:knife][:terremark_password],
+          :terremark_service  => Chef::Config[:knife][:terremark_service] || :vcloud
+        )
+
+        $stdout.sync = true
+
+        puts "Instantiating vApp #{h.color(server_name, :bold)}"
+        vapp_id = terremark.instantiate_vapp_template(server_name).body['href'].split('/').last
+
+        deploy_task_id = terremark.deploy_vapp(vapp_id).body['href'].split('/').last
+        print "Waiting for deploy task [#{h.color(deploy_task_id, :bold)}]"
+        terremark.tasks.get(deploy_task_id).wait_for { print "."; ready? }
+        print "\n"
+
+        power_on_task_id = terremark.power_on(vapp_id).body['href'].split('/').last
+        print "Waiting for power on task [#{h.color(power_on_task_id, :bold)}]"
+        terremark.tasks.get(power_on_task_id).wait_for { print "."; ready? }
+        print "\n"
+
+        private_ip = terremark.get_vapp(vapp_id).body['IpAddress']
+        ssh_internet_service = terremark.create_internet_service(terremark.default_vdc_id, 'SSH', 'TCP', 22).body
+        ssh_internet_service_id = ssh_internet_service['Id']
+        public_ip = ssh_internet_service['PublicIpAddress']['Name']
+        public_ip_id = ssh_internet_service['PublicIpAddress']['Id']
+        ssh_node_service_id = terremark.add_node_service(ssh_internet_service_id, private_ip, 'SSH', 22).body['Id']
+
+        puts "\nBootstrapping #{h.color(server_name, :bold)}..."
+        password = terremark.get_vapp_template(12).body['Description'].scan(/\npassword: (.*)\n/).first.first
+
+        command =  <<EOH
+bash -c '
+echo nameserver 208.67.222.222 > /etc/resolv.conf
+echo nameserver 208.67.220.220 >> /etc/resolv.conf
+
+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
+
+mkdir -p /etc/chef
+
+(
+cat <<'EOP'
+#{IO.read(Chef::Config[:validation_key])}
+EOP
+) > /etc/chef/validation.pem
+
+(
+cat <<'EOP'
+log_level        :info
+log_location     STDOUT
+chef_server_url  "#{Chef::Config[:chef_server_url]}" 
+validation_client_name "#{Chef::Config[:validation_client_name]}"
+EOP
+) > /etc/chef/client.rb
+
+(
+cat <<'EOP'
+#{{ "run_list" => @name_args[1..-1] }.to_json}
+EOP
+) > /etc/chef/first-boot.json
+
+/usr/bin/chef-client -j /etc/chef/first-boot.json'
+EOH
+
+        begin
+          ssh = Chef::Knife::Ssh.new
+          ssh.name_args = [ public_ip, "sudo #{command}" ]
+          ssh.config[:ssh_user] = "vcloud"
+          ssh.config[:manual] = true
+          ssh.config[:password] = password
+          ssh.password = password
+          ssh.run
+        rescue Errno::ETIMEDOUT
+          puts "Timed out on bootstrap, re-trying. Hit CTRL-C to abort."
+          puts "You probably need to log in to Terremark and powercycle #{h.color(@name_args[0], :bold)}"
+          retry
+        end
+
+      end
+    end
+  end
+end
+

data/lib/chef/knife/terremark_server_delete.rb

@@ -0,0 +1,87 @@
+#
+# 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 TerremarkServerDelete < Knife
+
+      banner "Sub-Command: terremark server delete SERVER (options)"
+
+      def h
+        @highline ||= HighLine.new
+      end
+
+      def run 
+        require 'fog'
+        require 'highline'
+
+        terremark = Fog::Terremark.new(
+          :terremark_username => Chef::Config[:knife][:terremark_username],
+          :terremark_password => Chef::Config[:knife][:terremark_password],
+          :terremark_service  => Chef::Config[:knife][:terremark_service] || :vcloud
+        )
+
+        $stdout.sync = true
+
+        vapp_id = terremark.servers.detect {|server| server.name == @name_args[0]}.id
+        confirm("Do you really want to delete server ID #{vapp_id} named #{@name_args[0]}")
+
+        puts "Cleaning up internet services..."
+        private_ip = terremark.servers.get(vapp_id).ip_address
+        internet_services = terremark.get_internet_services(terremark.default_vdc_id).body['InternetServices']
+        public_ip_usage = {}
+        internet_services.each do |internet_service|
+          public_ip_address = internet_service['PublicIpAddress']['Name']
+          public_ip_usage[public_ip_address] ||= []
+          public_ip_usage[public_ip_address] << internet_service['Id']
+        end
+        internet_services.each do |internet_service|
+          node_services = terremark.get_node_services(internet_service['Id']).body['NodeServices']
+          node_services.delete_if do |node_service|
+            if node_service['IpAddress'] == private_ip
+              terremark.delete_node_service(node_service['Id'])
+            end
+          end
+          if node_services.empty?
+            terremark.delete_internet_service(internet_service['Id'])
+            public_ip_usage.each_value {|internet_services| internet_services.delete(internet_service['Id'])}
+            if public_ip_usage[internet_service['PublicIpAddress']['Name']].empty?
+              terremark.delete_public_ip(internet_service['PublicIpAddress']['Id'])
+            end
+          end
+        end
+
+        power_off_task_id = terremark.power_off(vapp_id).body['href'].split('/').last
+        print "Waiting for power off task [#{h.color(power_off_task_id, :bold)}]"
+        terremark.tasks.get(power_off_task_id).wait_for { print '.'; ready? }
+        print "\n"
+
+        print "Deleting vApp #{h.color(vapp_id, :bold)}"
+        delete_vapp_task_id = terremark.delete_vapp(vapp_id).headers['Location'].split('/').last
+        terremark.tasks.get(delete_vapp_task_id).wait_for { print '.'; ready? }
+        print "\n"
+        
+        Chef::Log.warn("Deleted server #{@name_args[0]}")
+      end
+    end
+  end
+end
+

data/lib/chef/knife/terremark_server_list.rb

@@ -0,0 +1,77 @@
+#
+# 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'
+require 'tempfile'
+
+class Chef
+  class Knife
+    class TerremarkServerList < Knife
+
+      banner "Sub-Command: terremark server list (options)"
+
+      option :terremark_password,
+        :short => "-K PASSWORD",
+        :long => "--terremark-password PASSWORD",
+        :description => "Your terremark password",
+        :proc => Proc.new { |key| Chef::Config[:knife][:terremark_password] = key } 
+
+      option :terremark_username,
+        :short => "-A USERNAME",
+        :long => "--terremark-username USERNAME",
+        :description => "Your terremark username",
+        :proc => Proc.new { |username| Chef::Config[:knife][:terremark_username] = username } 
+
+      option :terremark_service,
+        :short => "-S SERVICE",
+        :long => "--terremark-service SERVICE",
+        :description => "Your terremark service name",
+        :proc => Proc.new { |service| Chef::Config[:knife][:terremark_service] = service } 
+
+      def h
+        @highline ||= HighLine.new
+      end
+
+      def run 
+        require 'fog'
+        require 'highline'
+
+        server_name = @name_args[0]
+
+        terremark = Fog::Terremark.new(
+          :terremark_username => Chef::Config[:knife][:terremark_username],
+          :terremark_password => Chef::Config[:knife][:terremark_password],
+          :terremark_service  => Chef::Config[:knife][:terremark_service] || :vcloud
+        )
+
+        $stdout.sync = true
+
+        server_list = [ h.color('ID', :bold), h.color('Name', :bold) ]
+        terremark.servers.all.each do |server|
+          server_list << server.id.to_s
+          server_list << server.name
+        end
+        puts h.list(server_list, :columns_across, 2)
+
+      end
+    end
+  end
+end
+
+

data/lib/chef/mixin/command.rb

@@ -97,6 +97,7 @@ class Chef
       #   timeout<String>: How many seconds to wait for the command to execute before timing out
       #   returns<String>: The single exit value command is expected to return, otherwise causes an exception
       #   ignore_failure<Boolean>: Whether to raise an exception on failure, or just return the status
+      #   output_on_failure<Boolean>: Return output in raised exception regardless of Log.level
       # 
       #   user<String>: The UID or user name of the user to execute the command as
       #   group<String>: The GID or group name of the group to execute the command as
@@ -108,6 +109,7 @@ class Chef
         command_output = ""
         
         args[:ignore_failure] ||= false
+        args[:output_on_failure] ||= false
 
         if args.has_key?(:creates)
           if File.exists?(args[:creates])
@@ -165,18 +167,18 @@ class Chef
       
       module_function :output_of_command
       
-      def handle_command_failures(status, command_output, args={})
-        unless args[:ignore_failure] 
-          args[:returns] ||= 0
-          if status.exitstatus != args[:returns]
+      def handle_command_failures(status, command_output, opts={})
+        unless opts[:ignore_failure]
+          opts[:returns] ||= 0
+          unless Array(opts[:returns]).include?(status.exitstatus)
             # if the log level is not debug, through output of command when we fail
             output = ""
-            if Chef::Log.level == :debug
-              output << "\n---- Begin output of #{args[:command]} ----\n"
-              output << "#{command_output}"
-              output << "---- End output of #{args[:command]} ----\n"
+            if Chef::Log.level == :debug || opts[:output_on_failure]
+              output << "\n---- Begin output of #{opts[:command]} ----\n"
+              output << command_output.to_s
+              output << "\n---- End output of #{opts[:command]} ----\n"
             end
-            raise Chef::Exceptions::Exec, "#{args[:command]} returned #{status.exitstatus}, expected #{args[:returns]}#{output}"
+            raise Chef::Exceptions::Exec, "#{opts[:command]} returned #{status.exitstatus}, expected #{opts[:returns]}#{output}"
           end
         end
       end

data/lib/chef/mixin/params_validate.rb

@@ -193,7 +193,7 @@ class Chef
               end
             end
             unless passes
-              raise Exceptions::ValidationFailed, "Option #{key}'s value #{value} does not match regular expression #{regex.to_s}"
+              raise Exceptions::ValidationFailed, "Option #{key}'s value #{value} does not match regular expression #{regex.inspect}"
             end
           end
         end

data/lib/chef/mixin/recipe_definition_dsl_core.rb

@@ -17,11 +17,14 @@
 # limitations under the License.
 #
 
-require 'chef/recipe'
 require 'chef/resource'
 require 'chef/mixin/convert_to_class_name'
 require 'chef/mixin/language'
 
+# UGH. this is a circular require that will cause an uninitialized constant
+# error, but this file really does depend on Chef::Recipe. oh well.
+# require 'chef/recipe'
+
 class Chef
   module Mixin
     module RecipeDefinitionDSLCore

data/lib/chef/mixin/template.rb

@@ -42,15 +42,16 @@ class Chef
         rescue Object => e
           raise TemplateError.new(e, template, context)
         end
-        final_tempfile = Tempfile.new("chef-rendered-template")
-        final_tempfile.print(output)
-        final_tempfile.close
-        final_tempfile
+        Tempfile.open("chef-rendered-template") do |tempfile|
+          tempfile.print(output)
+          tempfile.close
+          yield tempfile
+        end
       end
       
       class TemplateError < RuntimeError
         attr_reader :original_exception, :context
-        SOURCE_CONTEXT_WINDOW = 2 unless defined? SOURCE_CONTEXT_WINDOW
+        SOURCE_CONTEXT_WINDOW = 2
         
         def initialize(original_exception, template, context)
           @original_exception, @template, @context = original_exception, template, context

data/lib/chef/mixin/xml_escape.rb

@@ -80,18 +80,18 @@ class Chef
         156 =>  339, # latin small ligature oe
         158 =>  382, # latin small letter z with caron
         159 =>  376 # latin capital letter y with diaeresis
-      } unless defined?(CP1252)
+      }
 
       # http://www.w3.org/TR/REC-xml/#dt-chardata
       PREDEFINED = {
         38 => '&', # ampersand
         60 => '<',  # left angle bracket
         62 => '>'  # right angle bracket
-      } unless defined?(PREDEFINED)
+      }
 
       # http://www.w3.org/TR/REC-xml/#charsets
       VALID = [[0x9, 0xA, 0xD], (0x20..0xD7FF), 
-        (0xE000..0xFFFD), (0x10000..0x10FFFF)] unless defined?(VALID)
+        (0xE000..0xFFFD), (0x10000..0x10FFFF)]
 
       def xml_escape(unescaped_str)
         begin

data/lib/chef/mixins.rb

@@ -0,0 +1,16 @@
+require 'chef/mixin/check_helper'
+require 'chef/mixin/checksum'
+require 'chef/mixin/command'
+require 'chef/mixin/convert_to_class_name'
+require 'chef/mixin/create_path'
+require 'chef/mixin/deep_merge'
+require 'chef/mixin/find_preferred_file'
+require 'chef/mixin/from_file'
+require 'chef/mixin/generate_url'
+require 'chef/mixin/language'
+require 'chef/mixin/language_include_attribute'
+require 'chef/mixin/language_include_recipe'
+require 'chef/mixin/params_validate'
+require 'chef/mixin/recipe_definition_dsl_core'
+require 'chef/mixin/template'
+require 'chef/mixin/xml_escape'