diff options
| -rw-r--r-- | lib/chef/knife/bootstrap.rb | 2 | ||||
| -rw-r--r-- | spec/unit/knife/bootstrap_spec.rb | 20 |
2 files changed, 3 insertions, 19 deletions
diff --git a/lib/chef/knife/bootstrap.rb b/lib/chef/knife/bootstrap.rb index b2f2d63f16..c05957c8bc 100644 --- a/lib/chef/knife/bootstrap.rb +++ b/lib/chef/knife/bootstrap.rb @@ -288,7 +288,7 @@ class Chef end def bootstrap_template - # + # Allow passing a bootstrap template or use the default # @return [String] The CLI specific bootstrap template or the default config[:bootstrap_template] || default_bootstrap_template end diff --git a/spec/unit/knife/bootstrap_spec.rb b/spec/unit/knife/bootstrap_spec.rb index 736ff9b099..2ac290bb09 100644 --- a/spec/unit/knife/bootstrap_spec.rb +++ b/spec/unit/knife/bootstrap_spec.rb @@ -84,24 +84,8 @@ describe Chef::Knife::Bootstrap do end end - context "with :distro and :bootstrap_template cli options" do - let(:bootstrap_cli_options) { [ "--bootstrap-template", "my-template", "--distro", "other-template" ] } - - it "should select bootstrap template" do - expect(File.basename(knife.bootstrap_template)).to eq("my-template") - end - end - - context "with :distro and :template_file cli options" do - let(:bootstrap_cli_options) { [ "--distro", "my-template", "--template-file", "other-template" ] } - - it "should select bootstrap template" do - expect(File.basename(knife.bootstrap_template)).to eq("other-template") - end - end - context "with :bootstrap_template and :template_file cli options" do - let(:bootstrap_cli_options) { [ "--bootstrap-template", "my-template", "--template-file", "other-template" ] } + let(:bootstrap_cli_options) { [ "--bootstrap-template", "my-template", "other-template" ] } it "should select bootstrap template" do expect(File.basename(knife.bootstrap_template)).to eq("my-template") @@ -235,7 +219,7 @@ describe Chef::Knife::Bootstrap do end end - ["-d", "--distro", "-t", "--bootstrap-template", "--template-file"].each do |t| + ["-t", "--bootstrap-template"].each do |t| context "when #{t} option is given in the command line" do it "sets the knife :bootstrap_template config" do knife.parse_options([t, "blahblah"]) |