Permalink
Browse files

Merge commit 'e63b603545baff1ea4704c3bc6399c04d8e8b758'

  • Loading branch information...
mattray committed May 11, 2012
2 parents ea07d7d + e63b603 commit fe88a35af4e2c25464a8e3afa9bc24fb08860819
Showing with 6 additions and 0 deletions.
  1. +6 −0 lib/chef/knife/hp_server_create.rb
@@ -89,6 +89,11 @@ class HpServerCreate < Knife
: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 :distro,
:short => "-d DISTRO",
:long => "--distro DISTRO",
@@ -227,6 +232,7 @@ def bootstrap_for_node(server)
bootstrap.config[:chef_node_name] = server.name
bootstrap.config[:prerelease] = config[:prerelease]
bootstrap.config[:bootstrap_version] = locate_config_value(:bootstrap_version)
+ bootstrap.config[:bootstrap_proxy] = locate_config_value(:bootstrap_proxy)
bootstrap.config[:distro] = locate_config_value(:distro)
bootstrap.config[:use_sudo] = true unless config[:ssh_user] == 'root'
bootstrap.config[:template_file] = locate_config_value(:template_file)

0 comments on commit fe88a35

Please sign in to comment.