chef 0.9.18 → 0.10.0.beta.0

data/lib/chef/knife/bootstrap.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.
@@ -17,34 +17,30 @@
 #
 
 require 'chef/knife'
-require 'chef/json_compat'
-require 'tempfile'
-require 'erubis'
 
 class Chef
   class Knife
     class Bootstrap < Knife
 
+      deps do
+        require 'chef/json_compat'
+        require 'tempfile'
+        require 'erubis'
+      end
+
       banner "knife bootstrap FQDN [RUN LIST...] (options)"
 
       option :ssh_user,
         :short => "-x USERNAME",
         :long => "--ssh-user USERNAME",
         :description => "The ssh username",
-        :default => "root" 
+        :default => "root"
 
       option :ssh_password,
         :short => "-P PASSWORD",
         :long => "--ssh-password PASSWORD",
         :description => "The ssh password"
 
-      option :ssh_port,
-        :short => "-p PORT",
-        :long => "--ssh-port PORT",
-        :description => "The ssh port",
-        :default => "22",
-        :proc => Proc.new { |key| Chef::Config[:knife][:ssh_port] = key }
-
       option :identity_file,
         :short => "-i IDENTITY_FILE",
         :long => "--identity-file IDENTITY_FILE",
@@ -59,11 +55,6 @@ class Chef
         :long => "--prerelease",
         :description => "Install the pre-release chef gems"
 
-      option :bootstrap_version,
-        :long => "--bootstrap-version",
-        :description => "The version of Chef to install",
-        :proc => lambda { |v| Chef::Config[:bootstrap_version] = v }
-
       option :distro,
         :short => "-d DISTRO",
         :long => "--distro DISTRO",
@@ -84,12 +75,14 @@ class Chef
         :short => "-r RUN_LIST",
         :long => "--run-list RUN_LIST",
         :description => "Comma separated list of roles/recipes to apply",
-        :proc => lambda { |o| o.split(",") },
+        :proc => lambda { |o| o.split(/[\s,]+/) },
         :default => []
 
-      def h
-        @highline ||= HighLine.new
-      end
+      option :no_host_key_verify,
+        :long => "--no-host-key-verify",
+        :description => "Disable host key verification",
+        :boolean => true,
+        :default => false
 
       def load_template(template=nil)
         # Are we bootstrapping using an already shipped template?
@@ -108,12 +101,12 @@ class Chef
         end
 
         unless template
-          Chef::Log.info("Can not find bootstrap definition for #{config[:distro]}")
+          ui.info("Can not find bootstrap definition for #{config[:distro]}")
           raise Errno::ENOENT
         end
 
         Chef::Log.debug("Found bootstrap template in #{File.dirname(template)}")
-        
+
         IO.read(template).chomp
       end
 
@@ -124,16 +117,18 @@ class Chef
         Erubis::Eruby.new(template).evaluate(context)
       end
 
-      def run 
+      def run
         require 'highline'
+        require 'net/ssh'
 
         validate_name_args!
+        @node_name = Array(@name_args).first
+        # back compat--templates may use this setting:
+        config[:server_name] = @node_name
 
         $stdout.sync = true
 
-        Chef::Log.info("Bootstrapping Chef on #{h.color(config[:server_name], :bold)}")
-
-        knife_ssh.load_late_dependencies
+        ui.info("Bootstrapping Chef on #{ui.color(@node_name, :bold)}")
 
         begin
           knife_ssh.run
@@ -147,7 +142,7 @@ class Chef
 
       def validate_name_args!
         if Array(@name_args).first.nil?
-          Chef::Log.error("Must pass an FQDN or ip to bootstrap")
+          ui.error("Must pass an FQDN or ip to bootstrap")
           exit 1
         end
       end
@@ -159,11 +154,11 @@ class Chef
       def knife_ssh
         ssh = Chef::Knife::Ssh.new
         ssh.name_args = [ server_name, ssh_command ]
-        ssh.config[:ssh_user] = config[:ssh_user] 
+        ssh.config[:ssh_user] = config[:ssh_user]
         ssh.config[:ssh_password] = config[:ssh_password]
-        ssh.config[:ssh_port] = Chef::Config[:knife][:ssh_port] || config[:ssh_port]
         ssh.config[:identity_file] = config[:identity_file]
         ssh.config[:manual] = true
+        ssh.config[:no_host_key_verify] = config[:no_host_key_verify]
         ssh
       end
 
@@ -184,36 +179,7 @@ class Chef
         command
       end
 
-      module TemplateHelper
-
-        #
-        # == Chef::Knife::Bootstrap::TemplateHelper
-        #
-        # The methods in the TemplateHelper module expect to have access to
-        # the instance varialbles set above as part of the context in the
-        # Chef::Knife::Bootstrap#render_context method. Those instance
-        # variables are:
-        #
-        # * @config   - a hash of knife's config values
-        # * @run_list - the run list for the node to boostrap
-        #
-
-        ::Erubis::Context.send(:include, Chef::Knife::Bootstrap::TemplateHelper)
-
-        def bootstrap_version_string(type=nil)
-          version = Chef::Config[:bootstrap_version] || Chef::VERSION
-          case type
-          when :gems
-            if @config[:prerelease]
-              "--prerelease"
-            else
-              "--version #{version}"
-            end
-          else
-            version
-          end
-        end
-      end
     end
   end
 end
+

data/lib/chef/knife/bootstrap/archlinux-gems.erb

@@ -3,8 +3,7 @@ if [ ! -f /usr/bin/chef-client ]; then
   pacman -Syy
   pacman -S --noconfirm ruby ntp base-devel
   ntpdate -u pool.ntp.org
-  gem install ohai --no-rdoc --no-ri --verbose
-  gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string(:gems) %>
+  gem install ohai chef --no-rdoc --no-ri --verbose <%= '--prerelease' if @config[:prerelease] %>
 fi
 
 mkdir -p /etc/chef
@@ -27,6 +26,9 @@ validation_client_name "<%= Chef::Config[:validation_client_name] %>"
 <% else %>
 node_name "<%= @config[:chef_node_name] %>"
 <% end %> 
+<% if Chef::Config[:environment] != nil %>
+environment "<%= Chef::Config[:environment]%>"
+<% end %>
 # ArchLinux follows the Filesystem Hierarchy Standard
 file_cache_path    "/var/cache/chef"
 file_backup_path   "/var/lib/chef/backup"

data/lib/chef/knife/bootstrap/centos5-gems.erb

@@ -1,21 +1,12 @@
 bash -c '
-if [ ! -f /usr/bin/chef-client ]; then
-  rpm -Uvh http://download.fedora.redhat.com/pub/epel/5/i386/epel-release-5-4.noarch.rpm
-  rpm -Uvh http://download.elff.bravenet.com/5/i386/elff-release-5-3.noarch.rpm
+rpm -Uvh http://download.fedora.redhat.com/pub/epel/5/i386/epel-release-5-4.noarch.rpm
+rpm -Uvh http://download.elff.bravenet.com/5/i386/elff-release-5-3.noarch.rpm
 
-  yum install -y ruby ruby-devel gcc gcc-c++ automake autoconf make
-
-  cd /tmp
-  wget http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz
-  tar zxf rubygems-1.3.7.tgz
-  cd rubygems-1.3.7
-  ruby setup.rb --no-format-executable
-fi
+yum install -q -y ruby ruby-devel gcc gcc-c++ automake autoconf rubygems make
 
 gem update --system
 gem update
-gem install ohai --no-rdoc --no-ri --verbose
-gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string(:gems) %>
+gem install ohai chef --no-rdoc --no-ri --verbose <%= '--prerelease' if @config[:prerelease] %>
 
 mkdir -p /etc/chef
 
@@ -34,10 +25,10 @@ log_location     STDOUT
 chef_server_url  "<%= Chef::Config[:chef_server_url] %>"
 validation_client_name "<%= Chef::Config[:validation_client_name] %>"
 <% if @config[:chef_node_name] == nil %>
-# Using default node name (fqdn)
+# Using default node name"
 <% else %>
 node_name "<%= @config[:chef_node_name] %>"
-<% end %>
+<% end %> 
 EOP
 ) > /etc/chef/client.rb
 

data/lib/chef/knife/bootstrap/fedora13-gems.erb

@@ -1,10 +1,9 @@
 bash -c '
-yum install -y ruby ruby-devel gcc gcc-c++ automake autoconf rubygems make
+yum install -q -y ruby ruby-devel gcc gcc-c++ automake autoconf rubygems make
 
 gem update --system
 gem update
-gem install ohai --no-rdoc --no-ri --verbose
-gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string(:gems) %>
+gem install ohai chef --no-rdoc --no-ri --verbose <%= '--prerelease' if @config[:prerelease] %>
 
 mkdir -p /etc/chef
 
@@ -26,7 +25,7 @@ validation_client_name "<%= Chef::Config[:validation_client_name] %>"
 # Using default node name"
 <% else %>
 node_name "<%= @config[:chef_node_name] %>"
-<% end %>
+<% end %> 
 EOP
 ) > /etc/chef/client.rb
 

data/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb

@@ -1,6 +1,6 @@
 bash -c '
 if [ ! -f /usr/bin/chef-client ]; then
-  echo "chef	chef/chef_server_url	string	<%= Chef::Config[:chef_server_url] %>" | debconf-set-selections
+  echo "chef	chef/chef_server_url	string	<%= Chef::Config[:chef_server_url] %>" | debconf-set-selections 
   [ -f /etc/apt/sources.list.d/opscode.list ] || echo "deb http://apt.opscode.com lucid main" > /etc/apt/sources.list.d/opscode.list
   wget -O- http://apt.opscode.com/packages@opscode.com.gpg.key | apt-key add -
 fi
@@ -21,7 +21,7 @@ rm /tmp/validation.pem
 
 <% if @config[:chef_node_name] %>
 [ `grep -qx "node_name \"<%= @config[:chef_node_name] %>\"" /etc/chef/client.rb` ] || echo "node_name \"<%= @config[:chef_node_name] %>\"" >> /etc/chef/client.rb
-<% end -%>
+<% end -%> 
 
 (
 cat <<'EOP'

data/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb

@@ -8,9 +8,7 @@ if [ ! -f /usr/bin/chef-client ]; then
   cd rubygems-1.3.7
   ruby setup.rb --no-format-executable
 fi
-
-gem install ohai --no-rdoc --no-ri --verbose
-gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string(:gems) %>
+gem install ohai chef --no-rdoc --no-ri --verbose <%= '--prerelease' if @config[:prerelease] %>
 
 mkdir -p /etc/chef
 
@@ -29,10 +27,13 @@ log_location     STDOUT
 chef_server_url  "<%= Chef::Config[:chef_server_url] %>"
 validation_client_name "<%= Chef::Config[:validation_client_name] %>"
 <% if @config[:chef_node_name] == nil %>
-# Using default node name (fqdn)
+# Using default node name"
 <% else %>
 node_name "<%= @config[:chef_node_name] %>"
-<% end %> 
+<% end %>
+<% if Chef::Config[:environment] != nil %>
+environment "<%= Chef::Config[:environment]%>"
+<% end %>
 EOP
 ) > /etc/chef/client.rb
 

data/lib/chef/knife/client_bulk_delete.rb

@@ -17,18 +17,21 @@
 #
 
 require 'chef/knife'
-require 'chef/api_client'
-require 'chef/json_compat'
 
 class Chef
   class Knife
     class ClientBulkDelete < Knife
 
+      deps do
+        require 'chef/api_client'
+        require 'chef/json_compat'
+      end
+
       banner "knife client bulk delete REGEX (options)"
 
       def run 
         if @name_args.length < 1
-          Chef::Log.fatal("You must supply a regular expression to match the results against")
+          ui.fatal("You must supply a regular expression to match the results against")
           exit 42
         else
           bulk_delete(Chef::ApiClient, "client", nil, nil, @name_args[0])

data/lib/chef/knife/client_create.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.
@@ -17,18 +17,21 @@
 #
 
 require 'chef/knife'
-require 'chef/api_client'
-require 'chef/json_compat'
 
 class Chef
   class Knife
     class ClientCreate < Knife
 
+      deps do
+        require 'chef/api_client'
+        require 'chef/json_compat'
+      end
+
       option :file,
         :short => "-f FILE",
         :long  => "--file FILE",
         :description => "Write the key to a file"
-      
+
       option :admin,
         :short => "-a",
         :long  => "--admin",
@@ -42,20 +45,20 @@ class Chef
 
         if @client_name.nil?
           show_usage
-          Chef::Log.fatal("You must specify a client name")
+          ui.fatal("You must specify a client name")
           exit 1
         end
-        
+
         client = Chef::ApiClient.new
         client.name(@client_name)
         client.admin(config[:admin])
-        
+
         output = edit_data(client)
 
         key = output.save
 
-        Chef::Log.info("Created (or updated) #{output}")
-        
+        ui.info("Created (or updated) #{output}")
+
         if config[:file]
           File.open(config[:file], "w") do |f|
             f.print(key['private_key'])

data/lib/chef/knife/client_delete.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.
@@ -17,24 +17,27 @@
 #
 
 require 'chef/knife'
-require 'chef/api_client'
-require 'chef/json_compat'
 
 class Chef
   class Knife
     class ClientDelete < Knife
 
+      deps do
+        require 'chef/api_client'
+        require 'chef/json_compat'
+      end
+
       banner "knife client delete CLIENT (options)"
 
-      def run 
+      def run
         @client_name = @name_args[0]
 
         if @client_name.nil?
           show_usage
-          Chef::Log.fatal("You must specify a client name")
+          ui.fatal("You must specify a client name")
           exit 1
         end
-        
+
         delete_object(Chef::ApiClient, @client_name)
       end
 

data/lib/chef/knife/client_edit.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.
@@ -17,13 +17,16 @@
 #
 
 require 'chef/knife'
-require 'chef/api_client'
-require 'chef/json_compat'
 
 class Chef
   class Knife
     class ClientEdit < Knife
 
+      deps do
+        require 'chef/api_client'
+        require 'chef/json_compat'
+      end
+
       banner "knife client edit CLIENT (options)"
 
       def run
@@ -31,10 +34,10 @@ class Chef
 
         if @client_name.nil?
           show_usage
-          Chef::Log.fatal("You must specify a client name")
+          ui.fatal("You must specify a client name")
           exit 1
         end
-        
+
         edit_object(Chef::ApiClient, @client_name)
       end
     end