diff options
| author | sawanoboly <sawanoboriyu@higanworks.com> | 2019-12-11 13:19:46 +0900 |
|---|---|---|
| committer | sawanoboly <sawanoboriyu@higanworks.com> | 2019-12-11 13:21:46 +0900 |
| commit | b97caf5a48cf50dfcf17da2af30a9a0198cd6ae5 (patch) | |
| tree | 5a258ac86234c2b973d6f95951529e51b82a2009 /lib/chef | |
| parent | 4097bb0603e3a18bb3be66f7512b2ac0ed6a96ba (diff) | |
| download | chef-b97caf5a48cf50dfcf17da2af30a9a0198cd6ae5.tar.gz | |
/bootstrap_project/bootstrap_product/
Signed-off-by: sawanoboly <sawanoboriyu@higanworks.com>
Diffstat (limited to 'lib/chef')
| -rw-r--r-- | lib/chef/knife/bootstrap.rb | 7 | ||||
| -rw-r--r-- | lib/chef/knife/bootstrap/templates/chef-full.erb | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/chef/knife/bootstrap.rb b/lib/chef/knife/bootstrap.rb index 89192cd76f..3279f7970a 100644 --- a/lib/chef/knife/bootstrap.rb +++ b/lib/chef/knife/bootstrap.rb @@ -296,10 +296,9 @@ class Chef description: "URL to a custom installation script.", proc: Proc.new { |u| Chef::Config[:knife][:bootstrap_url] = u } - option :bootstrap_project, - long: "--bootstrap-project PROJECT", - description: "Project to install.", - proc: Proc.new { |u| Chef::Config[:knife][:bootstrap_project] = u }, + option :bootstrap_product, + long: "--bootstrap-product PRODUCT", + description: "Product to install.", default: "chef" option :msi_url, # Windows target only diff --git a/lib/chef/knife/bootstrap/templates/chef-full.erb b/lib/chef/knife/bootstrap/templates/chef-full.erb index 9bb4f5050b..febc414b13 100644 --- a/lib/chef/knife/bootstrap/templates/chef-full.erb +++ b/lib/chef/knife/bootstrap/templates/chef-full.erb @@ -177,7 +177,7 @@ do_download() { else echo "-----> Installing Chef Omnibus (<%= @config[:channel] %>/<%= version_to_install %>)" do_download ${install_sh} $tmp_dir/install.sh - sh $tmp_dir/install.sh -P <%= @config[:bootstrap_project] %> -c <%= @config[:channel] %> -v <%= version_to_install %> + sh $tmp_dir/install.sh -P <%= @config[:bootstrap_product] %> -c <%= @config[:channel] %> -v <%= version_to_install %> fi <% end %> |