diff options
| author | dheerajd-msys <dheeraj.dubey@msystechnologies.com> | 2019-05-25 02:35:38 +0530 |
|---|---|---|
| committer | Bryan McLellan <btm@loftninjas.org> | 2019-05-24 14:05:38 -0700 |
| commit | 2fb90b5568b5d9d5b2ca85c1f193350e2170b79a (patch) | |
| tree | 68cedf5e59cdfef57e8bdd0ea9e090d10ba81c11 | |
| parent | 277231271eabc1570923a477dc51a9332900170a (diff) | |
| download | chef-2fb90b5568b5d9d5b2ca85c1f193350e2170b79a.tar.gz | |
fix order of connection before register node (#8574)
Signed-off-by: dheerajd-msys <dheeraj.dubey@msystechnologies.com>
| -rw-r--r-- | lib/chef/knife/bootstrap.rb | 2 | ||||
| -rw-r--r-- | spec/unit/knife/bootstrap_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/knife/bootstrap.rb b/lib/chef/knife/bootstrap.rb index d65d9da396..1fc4a98680 100644 --- a/lib/chef/knife/bootstrap.rb +++ b/lib/chef/knife/bootstrap.rb @@ -543,8 +543,8 @@ class Chef warn_on_short_session_timeout $stdout.sync = true - register_client connect! + register_client content = render_template bootstrap_path = upload_bootstrap(content) diff --git a/spec/unit/knife/bootstrap_spec.rb b/spec/unit/knife/bootstrap_spec.rb index 4a7286bd6f..13e7906de8 100644 --- a/spec/unit/knife/bootstrap_spec.rb +++ b/spec/unit/knife/bootstrap_spec.rb @@ -1664,8 +1664,8 @@ describe Chef::Knife::Bootstrap do expect(knife).to receive(:validate_policy_options!).ordered expect(knife).to receive(:winrm_warn_no_ssl_verification).ordered expect(knife).to receive(:warn_on_short_session_timeout).ordered - expect(knife).to receive(:register_client).ordered expect(knife).to receive(:connect!).ordered + expect(knife).to receive(:register_client).ordered expect(knife).to receive(:render_template).and_return "content" expect(knife).to receive(:upload_bootstrap).with("content").and_return "/remote/path.sh" expect(knife).to receive(:perform_bootstrap).with("/remote/path.sh") |