knife-windows 0.5.4 → 0.5.6

data/CHANGELOG

@@ -1,3 +1,8 @@
+Release Notes - Knife Windows Plugin - Version 0.5.6
+
+** New Feature
+    * new default bootstrap template that installs Chef using official chef-client MSI installer
+
 Release Notes - Knife Windows Plugin - Version 0.5.4
 
 ** Bug

data/README.rdoc

@@ -23,7 +23,7 @@ This plugin provides the following Knife subcommands.  Specific command options
 The +winrm+ subcommand allows you to invoke commands in parallel on a subset of the nodes in your infrastructure. The +winrm+ subcommand uses the same syntax as the {search subcommand}[http://wiki.opscode.com/display/chef/Search]; you could could find the uptime of all your web servers using the command:
 
     % knife winrm "role:web" "net stats srv" -x Administrator -P 'super_secret_password'
-    
+
 Or force a chef run:
 
     % knife winrm 'ec2-50-xx-xx-124.compute-1.amazonaws.com' 'chef-client -c c:/chef/client.rb' -m -x Administrator -P 'super_secret_password'
@@ -38,7 +38,7 @@ This subcommand operates in a very similar manner as {knife ssh}[http://wiki.ops
 
 == knife bootstrap windows winrm
 
-Performs a Chef Bootstrap (via the WinRM protocol) on the target node. The goal of the bootstrap is to get Chef installed on the target system so it can run Chef Client with a Chef Server. The main assumption is a baseline OS installation exists. It is primarily intended for Chef Client systems that talk to a Chef server. 
+Performs a Chef Bootstrap (via the WinRM protocol) on the target node. The goal of the bootstrap is to get Chef installed on the target system so it can run Chef Client with a Chef Server. The main assumption is a baseline OS installation exists. It is primarily intended for Chef Client systems that talk to a Chef server.
 
 This subcommand operates in a very similar manner as {knife bootstrap}[http://wiki.opscode.com/display/chef/Knife+Bootstrap]...just leveraging the WinRM protocol for communication.  An initial run_list for the node can also be passed to the subcommand. Example usage:
 
@@ -46,7 +46,7 @@ This subcommand operates in a very similar manner as {knife bootstrap}[http://wi
 
 == knife bootstrap windows ssh
 
-Performs a Chef Bootstrap (via the SSH protocol) on the target node. The goal of the bootstrap is to get Chef installed on the target system so it can run Chef Client with a Chef Server. The main assumption is a baseline OS installation exists. It is primarily intended for Chef Client systems that talk to a Chef server. 
+Performs a Chef Bootstrap (via the SSH protocol) on the target node. The goal of the bootstrap is to get Chef installed on the target system so it can run Chef Client with a Chef Server. The main assumption is a baseline OS installation exists. It is primarily intended for Chef Client systems that talk to a Chef server.
 
 This subcommand assumes the SSH session will use Windows native cmd.exe command shell vs a bash shell through an emulated cygwin layer.  Most popular Windows based SSHd daemons like {freeSSHd}[http://www.freesshd.com/] and {WinSSHD}[http://www.bitvise.com/winsshd] behave this way.
 
@@ -58,6 +58,17 @@ An initial run_list for the node can also be passed to the subcommand. Example u
 
 This gem provides the following bootstrap templates:
 
+== windows-chef-client-msi
+
+This bootstrap template does the following:
+
+* Installs the latest version of Chef (and all dependencies) using the `chef-client` msi.
+* Writes the validation.pem per the local knife configuration.
+* Writes a default config file for Chef (C:\chef\client.rb) using values from the +knife.rb+.
+* Creates a JSON attributes file containing the specified run list and run Chef.
+
+This is the default bootstrap template used by both the +windows+ +bootstrap+ subcommands.
+
 == windows-shell
 
 This bootstrap template does the following:
@@ -70,7 +81,7 @@ This bootstrap template does the following:
 * Writes a default config file for Chef (C:\chef\client.rb) using values from the +knife.rb+.
 * Creates a JSON attributes file containing the specified run list and run Chef.
 
-This is the default bootstrap template used by both the +windows+ +bootstrap+ subcommands.
+This should be considered a legacy bootstrap template and will most likely be removed in a future version.
 
 = REQUIREMENTS/SETUP:
 
@@ -85,7 +96,7 @@ Knife plugins require >= Chef 0.10.  More details about Knife plugins can be {fo
 A server running WinRM must also be configured properly to allow outside connections and the entire network path from the knife workstation to the server.  The easiest way to accomplish this is to use {WinRM's quick configuration option}[http://msdn.microsoft.com/en-us/library/aa384372(v=vs.85).aspx#quick_default_configuration]:
 
     C:\Users\Administrator> winrm quickconfig -q
-    
+
 The Chef and Ohai gem installations (that occur during bootstrap) take more memory than the default 150MB WinRM allocates per shell.  Bump it up to 300MB with the following setting:
 
     C:\Users\Administrator> winrm set winrm/config/winrs @{MaxMemoryPerShellMB="300"}
@@ -117,4 +128,4 @@ 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.
+limitations under the License.

data/lib/chef/knife/bootstrap/windows-chef-client-msi.erb

@@ -0,0 +1,48 @@
+@rem
+@rem Author:: Seth Chisamore (<schisamo@opscode.com>)
+@rem Copyright:: Copyright (c) 2011 Opscode, Inc.
+@rem License:: Apache License, Version 2.0
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem     http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+<%= "SETX HTTP_PROXY \"#{knife_config[:bootstrap_proxy]}\"" if knife_config[:bootstrap_proxy] %>
+mkdir C:\chef
+
+> C:\chef\wget.vbs (
+ <%= win_wget %>
+)
+
+@rem Install Chef using chef-client MSI installer
+cscript /nologo C:\chef\wget.vbs /url:http://s3.amazonaws.com/opscode-full-stack/windows/chef-client-0.10.4-6.msi /path:%TEMP%\chef-client-0.10.4-6.msi
+msiexec /qb /i %TEMP%\chef-client-0.10.4-6.msi
+
+> C:\chef\validation.pem (
+ <%= validation_key %>
+)
+
+<% if @config[:encrypted_data_bag_secret] -%>
+> C:\chef\encrypted_data_bag_secret (
+ <%= encrypted_data_bag_secret %>
+)
+<% end -%>
+
+> C:\chef\client.rb (
+ <%= config_content %>
+)
+
+> C:\chef\first-boot.json (
+ <%= run_list %>
+)
+
+<%= start_chef %>

data/lib/chef/knife/bootstrap/windows-shell.erb

@@ -31,14 +31,19 @@ cscript /nologo C:\chef\wget.vbs /url:http://cloud.github.com/downloads/oneclick
 mkdir C:\DevKit
 copy %TEMP%\rubydevkit.exe C:\DevKit
 cmd.exe /C C:\DevKit\rubydevkit.exe -y
-cmd.exe /C C:\ruby\bin\ruby c:/DevKit/dk.rb init
-cmd.exe /C C:\ruby\bin\ruby c:/DevKit/dk.rb install
 
-cmd.exe /C C:\ruby\bin\gem install win32-open3 rdp-ruby-wmi windows-api windows-pr --no-rdoc --no-ri --verbose
+@rem update path during bootstrap session
+SET PATH=%PATH%;C:\ruby\bin
+
+cmd.exe /C ruby c:/DevKit/dk.rb init
+cmd.exe /C ruby c:/DevKit/dk.rb install
+
+cmd.exe /C gem install win32-api win32-service --platform=mswin32
+cmd.exe /C gem install win32-open3 rdp-ruby-wmi windows-api windows-pr --no-rdoc --no-ri --verbose
 
 @rem Install Chef gems separately to prevent 'failed to allocate memory' errors
-cmd.exe /C C:\ruby\bin\gem install ohai --no-rdoc --no-ri --verbose
-cmd.exe /C C:\ruby\bin\gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string %>
+cmd.exe /C gem install ohai --no-rdoc --no-ri --verbose
+cmd.exe /C gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string %>
 
 > C:\chef\validation.pem (
  <%= validation_key %>

data/lib/chef/knife/bootstrap_windows_base.rb

@@ -57,7 +57,7 @@ class Chef
             :short => "-d DISTRO",
             :long => "--distro DISTRO",
             :description => "Bootstrap a distro using a template",
-            :default => "windows-shell"
+            :default => "windows-chef-client-msi"
 
           option :template_file,
             :long => "--template-file TEMPLATE",
@@ -135,7 +135,7 @@ class Chef
         # create a bootstrap.bat file on the node
         # we have to run the remote commands in 2047 char chunks
         create_bootstrap_bat_command do |command_chunk, chunk_num|
-          run_command("cmd.exe /C echo \"Rendering bootstrap.bat chunk #{chunk_num}\" && #{command_chunk}").run
+          run_command("cmd.exe /C echo \"Rendering '#{bootstrap_bat_file}' chunk #{chunk_num}\" && #{command_chunk}").run
         end
 
         # execute the bootstrap.bat file
@@ -163,7 +163,7 @@ class Chef
       end
 
       def bootstrap_bat_file
-        "%TEMP%\\bootstrap.bat"
+        @bootstrap_bat_file ||= "%TEMP%\\bootstrap-#{Process.pid}-#{Time.now.to_i}.bat"
       end
 
       def locate_config_value(key)
@@ -172,4 +172,4 @@ class Chef
       end
     end
   end
-end
+end

data/lib/chef/knife/core/windows_bootstrap_context.rb

@@ -79,7 +79,8 @@ CONFIG
         end
 
         def start_chef
-          "c:/ruby/bin/ruby c:/ruby/bin/chef-client -c c:/chef/client.rb -j c:/chef/first-boot.json -E #{bootstrap_environment}"
+          start_chef = "SET PATH=%PATH%;C:\\ruby\\bin;C:\\opscode\\chef\\bin;C:\\opscode\\chef\\embedded\\bin\n"
+          start_chef << "chef-client -c c:/chef/client.rb -j c:/chef/first-boot.json -E #{bootstrap_environment}\n"
         end
 
         def run_list

data/lib/knife-windows/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Windows
-    VERSION = "0.5.4"
+    VERSION = "0.5.6"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,40 +1,37 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: knife-windows
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.5.6
   prerelease: 
-  version: 0.5.4
 platform: ruby
-authors: 
+authors:
 - Seth Chisamore
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-12 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-24 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: em-winrm
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70211127012580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.5.2
   type: :runtime
-  version_requirements: *id001
-description: Plugin that adds functionality to Chef's Knife CLI for configuring/interacting with nodes running Microsoft Windows
-email: 
+  prerelease: false
+  version_requirements: *70211127012580
+description: Plugin that adds functionality to Chef's Knife CLI for configuring/interacting
+  with nodes running Microsoft Windows
+email:
 - schisamo@opscode.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - LICENSE
-files: 
+files:
 - .gitignore
 - CHANGELOG
 - Gemfile
@@ -42,6 +39,7 @@ files:
 - README.rdoc
 - Rakefile
 - knife-windows.gemspec
+- lib/chef/knife/bootstrap/windows-chef-client-msi.erb
 - lib/chef/knife/bootstrap/windows-shell.erb
 - lib/chef/knife/bootstrap_windows_base.rb
 - lib/chef/knife/bootstrap_windows_ssh.rb
@@ -50,33 +48,29 @@ files:
 - lib/chef/knife/winrm.rb
 - lib/chef/knife/winrm_base.rb
 - lib/knife-windows/version.rb
-has_rdoc: true
 homepage: https://github.com/opscode/knife-windows
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.9.1
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: Plugin that adds functionality to Chef's Knife CLI for configuring/interacting with nodes running Microsoft Windows
+summary: Plugin that adds functionality to Chef's Knife CLI for configuring/interacting
+  with nodes running Microsoft Windows
 test_files: []
-