knife-windows 0.5.15 → 0.6.0

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

@@ -1,222 +1,222 @@
-@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
-
-@rem Use delayed environment expansion so that ERRORLEVEL can be evaluated with the
-@rem !ERRORLEVEL! syntax which evaluates at execution of the line of script, not when
-@rem the line is read. See help for the /E switch from cmd.exe /? .
-@setlocal ENABLEDELAYEDEXPANSION
-
-<%= "SETX HTTP_PROXY \"#{knife_config[:bootstrap_proxy]}\"" if knife_config[:bootstrap_proxy] %>
-
-@set BOOTSTRAP_DIRECTORY=<%= bootstrap_directory %>
-@echo Checking for existing directory "%BOOTSTRAP_DIRECTORY%"...
-@if NOT EXIST %BOOTSTRAP_DIRECTORY% (
-    @echo Existing directory not found, creating.
-    @mkdir %BOOTSTRAP_DIRECTORY%
-) else (
-    @echo Existing directory found, skipping creation.
-)
-
-> <%= bootstrap_directory %>\wget.vbs (
- <%= win_wget %>
-)
-
-> <%= bootstrap_directory %>\wget.ps1 (
- <%= win_wget_ps %>
-)
-
-@rem Determine the version and the architecture
-
-@FOR /F "usebackq tokens=1-8 delims=.[] " %%A IN (`ver`) DO (
-@set WinMajor=%%D
-@set WinMinor=%%E
-@set WinBuild=%%F
-)
-
-@echo Detected Windows Version %WinMajor%.%WinMinor% Build %WinBuild%
-
-@set LATEST_OS_VERSION_MAJOR=6
-@set LATEST_OS_VERSION_MINOR=3
-
-@if /i %WinMajor% GTR %LATEST_OS_VERSION_MAJOR% goto VersionUnknown
-@if /i %WinMajor% EQU %LATEST_OS_VERSION_MAJOR%  (
-  @if /i %WinMinor% GTR %LATEST_OS_VERSION_MINOR% goto VersionUnknown
-)
-
-goto Version%WinMajor%.%WinMinor%
-
-:VersionUnknown
-@rem If this is an unknown version of windows set the default
-@set MACHINE_OS=2008r2
-@echo Warning: Unknown version of Windows, assuming default of Windows %MACHINE_OS%
-goto architecture_select
-
-:Version6.0
-@set MACHINE_OS=2008
-goto architecture_select
-
-:Version5.2
-@set MACHINE_OS=2003r2
-goto architecture_select
-
-:Version6.1
-@set MACHINE_OS=2008r2
-goto architecture_select
-
-:Version6.2
-@set MACHINE_OS=2012
-goto architecture_select
-
-@rem Currently Windows Server 2012 R2 is treated as equivalent to Windows Server 2012
-:Version6.3
-goto Version6.2
-
-:architecture_select
-goto Architecture%PROCESSOR_ARCHITEW6432%
-
-:Architecture
-goto Architecture%PROCESSOR_ARCHITECTURE%
-
-@rem If this is an unknown architecture set the default
-@set MACHINE_ARCH=i686
-goto install
-
-:Architecturex86
-@set MACHINE_ARCH=i686
-goto install
-
-:Architectureamd64
-@set MACHINE_ARCH=x86_64
-goto install
-
-:install
-@rem Install Chef using chef-client MSI installer
-
-<% url="https://www.opscode.com/chef/download?p=windows&pv=%MACHINE_OS%&m=%MACHINE_ARCH%" -%>
-<% url += "&v=#{@config[:bootstrap_version]}" if @config.key? :bootstrap_version -%>
-@set "REMOTE_SOURCE_MSI_URL=<%= url %>"
-@set "LOCAL_DESTINATION_MSI_PATH=<%= local_download_path %>"
-@set "CHEF_CLIENT_MSI_LOG_PATH=%TEMP%\chef-client-msi%RANDOM%.log"
-@set "FALLBACK_QUERY_STRING=&DownloadContext=PowerShell"
-
-@rem Clear any pre-existing downloads
-@echo Checking for existing downloaded package at "%LOCAL_DESTINATION_MSI_PATH%"
-@if EXIST "%LOCAL_DESTINATION_MSI_PATH%" (
-    @echo Found existing downloaded package, deleting.
-    @del /f /q "%LOCAL_DESTINATION_MSI_PATH%"
-    @if ERRORLEVEL 1 (
-        echo Warning: Failed to delete pre-existing package with status code !ERRORLEVEL! > "&2"
-    )
-) else (
-    echo No existing downloaded packages to delete.
-)
-
-@rem If there is somehow a name collision, remove pre-existing log
-@if EXIST "%CHEF_CLIENT_MSI_LOG_PATH%" del /f /q "%CHEF_CLIENT_MSI_LOG_PATH%"
-
-@echo Attempting to download client package using cscript...
-cscript /nologo <%= bootstrap_directory %>\wget.vbs /url:"%REMOTE_SOURCE_MSI_URL%" /path:"%LOCAL_DESTINATION_MSI_PATH%"
-
-@rem Work around issues found in Windows Server 2012 around job objects not respecting WSMAN memory quotas
-@rem that cause the MSI download process to exceed the quota even when it is increased by administrators.
-@rem Retry the download using a more memory-efficient mechanism that only works if PowerShell is available.
-@set DOWNLOAD_ERROR_STATUS=!ERRORLEVEL!
-@if ERRORLEVEL 1 (
-    @echo Failed cscript download with status code !DOWNLOAD_ERROR_STATUS! > "&2"
-    @if !DOWNLOAD_ERROR_STATUS!==0 set DOWNLOAD_ERROR_STATUS=2
-) else (
-    @rem Sometimes the error level is not set even when the download failed,
-    @rem so check for the file to be sure it is there -- if it is not, we will retry
-    @if NOT EXIST "%LOCAL_DESTINATION_MSI_PATH%" (
-        echo Failed download: download completed, but downloaded file not found > "&2"
-        set DOWNLOAD_ERROR_STATUS=2
-    ) else (
-        echo Download via cscript succeeded.
-    )
-)
-
-@if NOT %DOWNLOAD_ERROR_STATUS%==0 (
-    @echo Warning: Failed to download "%REMOTE_SOURCE_MSI_URL%" to "%LOCAL_DESTINATION_MSI_PATH%"
-    @echo Warning: Retrying download with PowerShell if available...
-
-    @if EXIST "%LOCAL_DESTINATION_MSI_PATH%" del /f /q "%LOCAL_DESTINATION_MSI_PATH%"
-
-    @set powershell_download=powershell.exe -ExecutionPolicy Unrestricted -NoProfile -NonInteractive -File  <%= bootstrap_directory %>\wget.ps1 "%REMOTE_SOURCE_MSI_URL%%FALLBACK_QUERY_STRING%" "%LOCAL_DESTINATION_MSI_PATH%"
-    @echo !powershell_download!
-    @call !powershell_download!
-    @if NOT ERRORLEVEL 1 (
-        echo Download via PowerShell succeeded.
-    ) else (
-        echo Failed to download "%REMOTE_SOURCE_MSI_URL%" with status code !ERRORLEVEL!. > "&2"
-        echo Exiting without bootstrapping due to download failure. > "&2"
-        exit /b 1
-    )
-)
-
-@echo Installing downloaded client package...
-
-<%= install_chef %>
-
-@if ERRORLEVEL 1 (
-    echo Chef-client package failed to install with status code !ERRORLEVEL!. > "&2"
-    echo See installation log for additional detail: %CHEF_CLIENT_MSI_LOG_PATH%. > "&2"
-) else (
-    @echo Installation completed successfully
-    del /f /q "%CHEF_CLIENT_MSI_LOG_PATH%"
-)
-
-@endlocal
-
-@echo off
-echo Writing validation key...
-
-> <%= bootstrap_directory %>\validation.pem (
- <%= validation_key %>
-)
-
-echo Validation key written.
-@echo on
-
-<% if @config[:encrypted_data_bag_secret] -%>
-> <%= bootstrap_directory %>\encrypted_data_bag_secret (
- <%= encrypted_data_bag_secret %>
-)
-<% end -%>
-
-<%# Generate Ohai Hints -%>
-<% unless @chef_config[:knife][:hints].nil? || @chef_config[:knife][:hints].empty? -%>
-mkdir <%= bootstrap_directory %>\ohai\hints
-
-<% @chef_config[:knife][:hints].each do |name, hash| -%>
-> <%= bootstrap_directory %>\ohai\hints\<%= name %>.json (
-  <%= escape_and_echo(hash.to_json) %>
-)
-<% end -%>
-<% end -%>
-
-> <%= bootstrap_directory %>\client.rb (
- <%= config_content %>
-)
-
-> <%= bootstrap_directory %>\first-boot.json (
- <%= first_boot %>
-)
-
-@echo Starting chef to bootstrap the node...
-<%= start_chef %>
-
+@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
+
+@rem Use delayed environment expansion so that ERRORLEVEL can be evaluated with the
+@rem !ERRORLEVEL! syntax which evaluates at execution of the line of script, not when
+@rem the line is read. See help for the /E switch from cmd.exe /? .
+@setlocal ENABLEDELAYEDEXPANSION
+
+<%= "SETX HTTP_PROXY \"#{knife_config[:bootstrap_proxy]}\"" if knife_config[:bootstrap_proxy] %>
+
+@set BOOTSTRAP_DIRECTORY=<%= bootstrap_directory %>
+@echo Checking for existing directory "%BOOTSTRAP_DIRECTORY%"...
+@if NOT EXIST %BOOTSTRAP_DIRECTORY% (
+    @echo Existing directory not found, creating.
+    @mkdir %BOOTSTRAP_DIRECTORY%
+) else (
+    @echo Existing directory found, skipping creation.
+)
+
+> <%= bootstrap_directory %>\wget.vbs (
+ <%= win_wget %>
+)
+
+> <%= bootstrap_directory %>\wget.ps1 (
+ <%= win_wget_ps %>
+)
+
+@rem Determine the version and the architecture
+
+@FOR /F "usebackq tokens=1-8 delims=.[] " %%A IN (`ver`) DO (
+@set WinMajor=%%D
+@set WinMinor=%%E
+@set WinBuild=%%F
+)
+
+@echo Detected Windows Version %WinMajor%.%WinMinor% Build %WinBuild%
+
+@set LATEST_OS_VERSION_MAJOR=6
+@set LATEST_OS_VERSION_MINOR=3
+
+@if /i %WinMajor% GTR %LATEST_OS_VERSION_MAJOR% goto VersionUnknown
+@if /i %WinMajor% EQU %LATEST_OS_VERSION_MAJOR%  (
+  @if /i %WinMinor% GTR %LATEST_OS_VERSION_MINOR% goto VersionUnknown
+)
+
+goto Version%WinMajor%.%WinMinor%
+
+:VersionUnknown
+@rem If this is an unknown version of windows set the default
+@set MACHINE_OS=2008r2
+@echo Warning: Unknown version of Windows, assuming default of Windows %MACHINE_OS%
+goto architecture_select
+
+:Version6.0
+@set MACHINE_OS=2008
+goto architecture_select
+
+:Version5.2
+@set MACHINE_OS=2003r2
+goto architecture_select
+
+:Version6.1
+@set MACHINE_OS=2008r2
+goto architecture_select
+
+:Version6.2
+@set MACHINE_OS=2012
+goto architecture_select
+
+@rem Currently Windows Server 2012 R2 is treated as equivalent to Windows Server 2012
+:Version6.3
+goto Version6.2
+
+:architecture_select
+goto Architecture%PROCESSOR_ARCHITEW6432%
+
+:Architecture
+goto Architecture%PROCESSOR_ARCHITECTURE%
+
+@rem If this is an unknown architecture set the default
+@set MACHINE_ARCH=i686
+goto install
+
+:Architecturex86
+@set MACHINE_ARCH=i686
+goto install
+
+:Architectureamd64
+@set MACHINE_ARCH=x86_64
+goto install
+
+:install
+@rem Install Chef using chef-client MSI installer
+
+<% url="https://www.opscode.com/chef/download?p=windows&pv=%MACHINE_OS%&m=%MACHINE_ARCH%" -%>
+<% url += "&v=#{@config[:bootstrap_version]}" if @config.key? :bootstrap_version -%>
+@set "REMOTE_SOURCE_MSI_URL=<%= url %>"
+@set "LOCAL_DESTINATION_MSI_PATH=<%= local_download_path %>"
+@set "CHEF_CLIENT_MSI_LOG_PATH=%TEMP%\chef-client-msi%RANDOM%.log"
+@set "FALLBACK_QUERY_STRING=&DownloadContext=PowerShell"
+
+@rem Clear any pre-existing downloads
+@echo Checking for existing downloaded package at "%LOCAL_DESTINATION_MSI_PATH%"
+@if EXIST "%LOCAL_DESTINATION_MSI_PATH%" (
+    @echo Found existing downloaded package, deleting.
+    @del /f /q "%LOCAL_DESTINATION_MSI_PATH%"
+    @if ERRORLEVEL 1 (
+        echo Warning: Failed to delete pre-existing package with status code !ERRORLEVEL! > "&2"
+    )
+) else (
+    echo No existing downloaded packages to delete.
+)
+
+@rem If there is somehow a name collision, remove pre-existing log
+@if EXIST "%CHEF_CLIENT_MSI_LOG_PATH%" del /f /q "%CHEF_CLIENT_MSI_LOG_PATH%"
+
+@echo Attempting to download client package using cscript...
+cscript /nologo <%= bootstrap_directory %>\wget.vbs /url:"%REMOTE_SOURCE_MSI_URL%" /path:"%LOCAL_DESTINATION_MSI_PATH%"
+
+@rem Work around issues found in Windows Server 2012 around job objects not respecting WSMAN memory quotas
+@rem that cause the MSI download process to exceed the quota even when it is increased by administrators.
+@rem Retry the download using a more memory-efficient mechanism that only works if PowerShell is available.
+@set DOWNLOAD_ERROR_STATUS=!ERRORLEVEL!
+@if ERRORLEVEL 1 (
+    @echo Failed cscript download with status code !DOWNLOAD_ERROR_STATUS! > "&2"
+    @if !DOWNLOAD_ERROR_STATUS!==0 set DOWNLOAD_ERROR_STATUS=2
+) else (
+    @rem Sometimes the error level is not set even when the download failed,
+    @rem so check for the file to be sure it is there -- if it is not, we will retry
+    @if NOT EXIST "%LOCAL_DESTINATION_MSI_PATH%" (
+        echo Failed download: download completed, but downloaded file not found > "&2"
+        set DOWNLOAD_ERROR_STATUS=2
+    ) else (
+        echo Download via cscript succeeded.
+    )
+)
+
+@if NOT %DOWNLOAD_ERROR_STATUS%==0 (
+    @echo Warning: Failed to download "%REMOTE_SOURCE_MSI_URL%" to "%LOCAL_DESTINATION_MSI_PATH%"
+    @echo Warning: Retrying download with PowerShell if available...
+
+    @if EXIST "%LOCAL_DESTINATION_MSI_PATH%" del /f /q "%LOCAL_DESTINATION_MSI_PATH%"
+
+    @set powershell_download=powershell.exe -ExecutionPolicy Unrestricted -NoProfile -NonInteractive -File  <%= bootstrap_directory %>\wget.ps1 "%REMOTE_SOURCE_MSI_URL%%FALLBACK_QUERY_STRING%" "%LOCAL_DESTINATION_MSI_PATH%"
+    @echo !powershell_download!
+    @call !powershell_download!
+    @if NOT ERRORLEVEL 1 (
+        echo Download via PowerShell succeeded.
+    ) else (
+        echo Failed to download "%REMOTE_SOURCE_MSI_URL%" with status code !ERRORLEVEL!. > "&2"
+        echo Exiting without bootstrapping due to download failure. > "&2"
+        exit /b 1
+    )
+)
+
+@echo Installing downloaded client package...
+
+<%= install_chef %>
+
+@if ERRORLEVEL 1 (
+    echo Chef-client package failed to install with status code !ERRORLEVEL!. > "&2"
+    echo See installation log for additional detail: %CHEF_CLIENT_MSI_LOG_PATH%. > "&2"
+) else (
+    @echo Installation completed successfully
+    del /f /q "%CHEF_CLIENT_MSI_LOG_PATH%"
+)
+
+@endlocal
+
+@echo off
+echo Writing validation key...
+
+> <%= bootstrap_directory %>\validation.pem (
+ <%= validation_key %>
+)
+
+echo Validation key written.
+@echo on
+
+<% if @config[:encrypted_data_bag_secret] -%>
+> <%= bootstrap_directory %>\encrypted_data_bag_secret (
+ <%= encrypted_data_bag_secret %>
+)
+<% end -%>
+
+<%# Generate Ohai Hints -%>
+<% unless @chef_config[:knife][:hints].nil? || @chef_config[:knife][:hints].empty? -%>
+mkdir <%= bootstrap_directory %>\ohai\hints
+
+<% @chef_config[:knife][:hints].each do |name, hash| -%>
+> <%= bootstrap_directory %>\ohai\hints\<%= name %>.json (
+  <%= escape_and_echo(hash.to_json) %>
+)
+<% end -%>
+<% end -%>
+
+> <%= bootstrap_directory %>\client.rb (
+ <%= config_content %>
+)
+
+> <%= bootstrap_directory %>\first-boot.json (
+ <%= first_boot %>
+)
+
+@echo Starting chef to bootstrap the node...
+<%= start_chef %>
+

data/lib/chef/knife/bootstrap_windows_base.rb

@@ -1,196 +1,206 @@
-#
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Copyright:: Copyright (c) 2011 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 'chef/encrypted_data_bag_item'
-require 'chef/knife/core/windows_bootstrap_context'
-
-class Chef
-  class Knife
-    module BootstrapWindowsBase
-
-      # :nodoc:
-      # Would prefer to do this in a rational way, but can't be done b/c of
-      # Mixlib::CLI's design :(
-      def self.included(includer)
-        includer.class_eval do
-
-          deps do
-            require 'readline'
-            require 'chef/json_compat'
-          end
-
-          option :chef_node_name,
-            :short => "-N NAME",
-            :long => "--node-name NAME",
-            :description => "The Chef node name for your new node"
-
-          option :prerelease,
-            :long => "--prerelease",
-            :description => "Install the pre-release chef gems"
-
-          option :bootstrap_version,
-            :long => "--bootstrap-version VERSION",
-            :description => "The version of Chef to install",
-            :proc => Proc.new { |v| Chef::Config[:knife][:bootstrap_version] = v }
-
-          option :bootstrap_proxy,
-            :long => "--bootstrap-proxy PROXY_URL",
-            :description => "The proxy server for the node being bootstrapped",
-            :proc => Proc.new { |p| Chef::Config[:knife][:bootstrap_proxy] = p }
-
-          option :bootstrap_no_proxy,
-            :long => "--bootstrap-no-proxy ",
-            :description => "Avoid a proxy server for the given addresses",
-            :proc => Proc.new { |np| Chef::Config[:knife][:bootstrap_no_proxy] = np }
-
-          option :distro,
-            :short => "-d DISTRO",
-            :long => "--distro DISTRO",
-            :description => "Bootstrap a distro using a template",
-            :default => "windows-chef-client-msi"
-
-          option :template_file,
-            :long => "--template-file TEMPLATE",
-            :description => "Full path to location of template to use",
-            :default => false
-
-          option :run_list,
-            :short => "-r RUN_LIST",
-            :long => "--run-list RUN_LIST",
-            :description => "Comma separated list of roles/recipes to apply",
-            :proc => lambda { |o| o.split(",") },
-            :default => []
-
-          option :first_boot_attributes,
-            :short => "-j JSON_ATTRIBS",
-            :long => "--json-attributes",
-            :description => "A JSON string to be added to the first run of chef-client",
-            :proc => lambda { |o| JSON.parse(o) },
-            :default => {}
-
-          option :encrypted_data_bag_secret,
-            :short => "-s SECRET",
-            :long  => "--secret ",
-            :description => "The secret key to use to decrypt data bag item values.  Will be rendered on the node at c:/chef/encrypted_data_bag_secret and set in the rendered client config.",
-            :default => false
-
-          option :encrypted_data_bag_secret_file,
-            :long => "--secret-file SECRET_FILE",
-            :description => "A file containing the secret key to use to encrypt data bag item values. Will be rendered on the node at c:/chef/encrypted_data_bag_secret and set in the rendered client config."
-
-        end
-      end
-
-      # TODO: This should go away when CHEF-2193 is fixed
-      def load_template(template=nil)
-        # Are we bootstrapping using an already shipped template?
-        if config[:template_file]
-          bootstrap_files = config[:template_file]
-        else
-          bootstrap_files = []
-          bootstrap_files << File.join(File.dirname(__FILE__), 'bootstrap', "#{config[:distro]}.erb")
-          bootstrap_files << File.join(Dir.pwd, ".chef", "bootstrap", "#{config[:distro]}.erb")
-          bootstrap_files << File.join(ENV['HOME'], '.chef', 'bootstrap', "#{config[:distro]}.erb")
-          bootstrap_files << Gem.find_files(File.join("chef","knife","bootstrap","#{config[:distro]}.erb"))
-          bootstrap_files.flatten!
-        end
-
-        template = Array(bootstrap_files).find do |bootstrap_template|
-          Chef::Log.debug("Looking for bootstrap template in #{File.dirname(bootstrap_template)}")
-          ::File.exists?(bootstrap_template)
-        end
-
-        unless template
-          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
-
-      def render_template(template=nil)
-        if config[:encrypted_data_bag_secret_file]
-          config[:encrypted_data_bag_secret] = Chef::EncryptedDataBagItem.load_secret(config[:encrypted_data_bag_secret_file])
-        end
-        context = Knife::Core::WindowsBootstrapContext.new(config, config[:run_list], Chef::Config)
-        Erubis::Eruby.new(template).evaluate(context)
-      end
-
-      def bootstrap(proto=nil)
-
-        validate_name_args!
-
-        @node_name = Array(@name_args).first
-        # back compat--templates may use this setting:
-        config[:server_name] = @node_name
-
-        STDOUT.sync = STDERR.sync = true
-
-        ui.info("Bootstrapping Chef on #{ui.color(@node_name, :bold)}")
-        # 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|
-          begin
-            render_command_result = run_command(%Q!cmd.exe /C echo "Rendering #{bootstrap_bat_file} chunk #{chunk_num}" && #{command_chunk}!)
-            ui.error("Batch render command returned #{render_command_result}") if render_command_result != 0
-            render_command_result
-          rescue SystemExit => e
-            raise unless e.success?
-          end
-        end
-
-        # execute the bootstrap.bat file
-        bootstrap_command_result = run_command(bootstrap_command)
-        ui.error("Bootstrap command returned #{bootstrap_command_result}") if bootstrap_command_result != 0
-        bootstrap_command_result
-      end
-
-      def bootstrap_command
-        @bootstrap_command ||= "cmd.exe /C #{bootstrap_bat_file}"
-      end
-
-      def create_bootstrap_bat_command(&block)
-        bootstrap_bat = []
-        chunk_num = 0
-        render_template(load_template(config[:bootstrap_template])).each_line do |line|
-          # escape WIN BATCH special chars
-          line.gsub!(/[(<|>)^]/).each{|m| "^#{m}"}
-          # windows commands are limited to 2047 characters
-          if((bootstrap_bat + [line]).join(" && ").size > 2047 )
-            yield bootstrap_bat.join(" && "), chunk_num += 1
-            bootstrap_bat = []
-          end
-          bootstrap_bat << ">> #{bootstrap_bat_file} (echo.#{line.chomp.strip})"
-        end
-        yield bootstrap_bat.join(" && "), chunk_num += 1
-      end
-
-      def bootstrap_bat_file
-        @bootstrap_bat_file ||= "\"%TEMP%\\bootstrap-#{Process.pid}-#{Time.now.to_i}.bat\""
-      end
-
-      def locate_config_value(key)
-        key = key.to_sym
-        Chef::Config[:knife][key] || config[key]
-      end
-    end
-  end
-end
+#
+# Author:: Seth Chisamore (<schisamo@opscode.com>)
+# Copyright:: Copyright (c) 2011 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 'chef/encrypted_data_bag_item'
+require 'chef/knife/core/windows_bootstrap_context'
+
+class Chef
+  class Knife
+    module BootstrapWindowsBase
+
+      # :nodoc:
+      # Would prefer to do this in a rational way, but can't be done b/c of
+      # Mixlib::CLI's design :(
+      def self.included(includer)
+        includer.class_eval do
+
+          deps do
+            require 'readline'
+            require 'chef/json_compat'
+          end
+
+          option :chef_node_name,
+            :short => "-N NAME",
+            :long => "--node-name NAME",
+            :description => "The Chef node name for your new node"
+
+          option :prerelease,
+            :long => "--prerelease",
+            :description => "Install the pre-release chef gems"
+
+          option :bootstrap_version,
+            :long => "--bootstrap-version VERSION",
+            :description => "The version of Chef to install",
+            :proc => Proc.new { |v| Chef::Config[:knife][:bootstrap_version] = v }
+
+          option :bootstrap_proxy,
+            :long => "--bootstrap-proxy PROXY_URL",
+            :description => "The proxy server for the node being bootstrapped",
+            :proc => Proc.new { |p| Chef::Config[:knife][:bootstrap_proxy] = p }
+
+          option :bootstrap_no_proxy,
+            :long => "--bootstrap-no-proxy ",
+            :description => "Avoid a proxy server for the given addresses",
+            :proc => Proc.new { |np| Chef::Config[:knife][:bootstrap_no_proxy] = np }
+
+          option :distro,
+            :short => "-d DISTRO",
+            :long => "--distro DISTRO",
+            :description => "Bootstrap a distro using a template",
+            :default => "windows-chef-client-msi"
+
+          option :template_file,
+            :long => "--template-file TEMPLATE",
+            :description => "Full path to location of template to use",
+            :default => false
+
+          option :run_list,
+            :short => "-r RUN_LIST",
+            :long => "--run-list RUN_LIST",
+            :description => "Comma separated list of roles/recipes to apply",
+            :proc => lambda { |o| o.split(",") },
+            :default => []
+
+          option :first_boot_attributes,
+            :short => "-j JSON_ATTRIBS",
+            :long => "--json-attributes",
+            :description => "A JSON string to be added to the first run of chef-client",
+            :proc => lambda { |o| JSON.parse(o) },
+            :default => {}
+
+          option :encrypted_data_bag_secret,
+            :short => "-s SECRET",
+            :long  => "--secret ",
+            :description => "The secret key to use to decrypt data bag item values.  Will be rendered on the node at c:/chef/encrypted_data_bag_secret and set in the rendered client config.",
+            :default => false
+
+          option :encrypted_data_bag_secret_file,
+            :long => "--secret-file SECRET_FILE",
+            :description => "A file containing the secret key to use to encrypt data bag item values. Will be rendered on the node at c:/chef/encrypted_data_bag_secret and set in the rendered client config."
+
+          option :auth_timeout,
+            :long => "--auth-timeout MINUTES",
+            :description => "The maximum time in minutes to wait to for authentication over the transport to the node to succeed. The default value is 25 minutes.",
+            :default => 25
+        end
+      end
+
+      # TODO: This should go away when CHEF-2193 is fixed
+      def load_template(template=nil)
+        # Are we bootstrapping using an already shipped template?
+        if config[:template_file]
+          bootstrap_files = config[:template_file]
+        else
+          bootstrap_files = []
+          bootstrap_files << File.join(File.dirname(__FILE__), 'bootstrap', "#{config[:distro]}.erb")
+          bootstrap_files << File.join(Dir.pwd, ".chef", "bootstrap", "#{config[:distro]}.erb")
+          bootstrap_files << File.join(ENV['HOME'], '.chef', 'bootstrap', "#{config[:distro]}.erb")
+          bootstrap_files << Gem.find_files(File.join("chef","knife","bootstrap","#{config[:distro]}.erb"))
+          bootstrap_files.flatten!
+        end
+
+        template = Array(bootstrap_files).find do |bootstrap_template|
+          Chef::Log.debug("Looking for bootstrap template in #{File.dirname(bootstrap_template)}")
+          ::File.exists?(bootstrap_template)
+        end
+
+        unless template
+          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
+
+      def render_template(template=nil)
+        if config[:encrypted_data_bag_secret_file]
+          config[:encrypted_data_bag_secret] = Chef::EncryptedDataBagItem.load_secret(config[:encrypted_data_bag_secret_file])
+        end
+        context = Knife::Core::WindowsBootstrapContext.new(config, config[:run_list], Chef::Config)
+        Erubis::Eruby.new(template).evaluate(context)
+      end
+
+      def bootstrap(proto=nil)
+        validate_name_args!
+
+        @node_name = Array(@name_args).first
+        # back compat--templates may use this setting:
+        config[:server_name] = @node_name
+
+        STDOUT.sync = STDERR.sync = true
+
+        wait_for_remote_response( config[:auth_timeout].to_i )
+        ui.info("Bootstrapping Chef on #{ui.color(@node_name, :bold)}")
+        # 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|
+          begin
+            render_command_result = run_command(%Q!cmd.exe /C echo "Rendering #{bootstrap_bat_file} chunk #{chunk_num}" && #{command_chunk}!)
+            ui.error("Batch render command returned #{render_command_result}") if render_command_result != 0
+            render_command_result
+          rescue SystemExit => e
+            raise unless e.success?
+          end
+        end
+
+        # execute the bootstrap.bat file
+        bootstrap_command_result = run_command(bootstrap_command)
+        ui.error("Bootstrap command returned #{bootstrap_command_result}") if bootstrap_command_result != 0
+        bootstrap_command_result
+      end
+
+      protected
+
+      # Default implementation -- override only if required by the transport
+      def wait_for_remote_response(wait_max_minutes)
+      end
+
+      def bootstrap_command
+        @bootstrap_command ||= "cmd.exe /C #{bootstrap_bat_file}"
+      end
+
+      def create_bootstrap_bat_command(&block)
+        bootstrap_bat = []
+        chunk_num = 0
+        render_template(load_template(config[:bootstrap_template])).each_line do |line|
+          # escape WIN BATCH special chars
+          line.gsub!(/[(<|>)^]/).each{|m| "^#{m}"}
+          # windows commands are limited to 2047 characters
+          if((bootstrap_bat + [line]).join(" && ").size > 2047 )
+            yield bootstrap_bat.join(" && "), chunk_num += 1
+            bootstrap_bat = []
+          end
+          bootstrap_bat << ">> #{bootstrap_bat_file} (echo.#{line.chomp.strip})"
+        end
+        yield bootstrap_bat.join(" && "), chunk_num += 1
+      end
+
+      def bootstrap_bat_file
+        @bootstrap_bat_file ||= "\"%TEMP%\\bootstrap-#{Process.pid}-#{Time.now.to_i}.bat\""
+      end
+
+      def locate_config_value(key)
+        key = key.to_sym
+        Chef::Config[:knife][key] || config[key]
+      end
+    end
+  end
+end