summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-04-30 09:24:10 -0700
committerGitHub <noreply@github.com>2019-04-30 09:24:10 -0700
commit04909f1f62b6112c6a2179642a433c9e139cbd6a (patch)
tree5f71025293a943aa42c822679e6950fa7e6e6512
parent52ed3d346c39dada17072e79745265550cb759b8 (diff)
parent5f529f7f5211c4767cd78ec4e96bf82797f8ac9c (diff)
downloadchef-04909f1f62b6112c6a2179642a433c9e139cbd6a.tar.gz
Merge pull request #8435 from MsysTechnologiesllc/vasundhara/Fix_for_bootstrap_error_while_using_msi_url_error
Fixed bootstrap error while using --msi-url option with knife bootstrap winrm
-rw-r--r--lib/chef/knife/core/windows_bootstrap_context.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/knife/core/windows_bootstrap_context.rb b/lib/chef/knife/core/windows_bootstrap_context.rb
index 7aa4c012aa..b1204aeb09 100644
--- a/lib/chef/knife/core/windows_bootstrap_context.rb
+++ b/lib/chef/knife/core/windows_bootstrap_context.rb
@@ -277,7 +277,7 @@ class Chef
# The default msi path has a number of url query parameters - we attempt to substitute
# such parameters in as long as they are provided by the template.
- if @config[:install].nil? || @config[:msi_url].empty?
+ if @config[:msi_url].nil? || @config[:msi_url].empty?
url = "https://www.chef.io/chef/download?p=windows"
url += "&pv=#{machine_os}" unless machine_os.nil?
url += "&m=#{machine_arch}" unless machine_arch.nil?