diff options
| author | Serdar Sutay <serdar@opscode.com> | 2014-03-12 12:37:59 -0700 |
|---|---|---|
| committer | Serdar Sutay <serdar@opscode.com> | 2014-03-12 12:37:59 -0700 |
| commit | 8cfb4ace7b5a9df6e64407c6bfddc3aa6496d64c (patch) | |
| tree | c28e7209d2b9f8b481f2f85b08e3d61e7f37e025 | |
| parent | 549e386a6fee8b23793df34b8dfd2979e19ea7fb (diff) | |
| parent | f2ac6d3e5e0134edd75cfeb1f61f870065c483b2 (diff) | |
| download | chef-8cfb4ace7b5a9df6e64407c6bfddc3aa6496d64c.tar.gz | |
Merge pull request #1295 from opscode/CHEF-5102
Make the initial bootstrap message more user friendly.
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | lib/chef/knife/bootstrap.rb | 2 | ||||
| -rw-r--r-- | lib/chef/knife/bootstrap/chef-full.erb | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 1df8605cca..9b0183a338 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ * Service Provider for MacOSX now supports `enable` and `disable` * CHEF-5086: Add reboot_pending? helper to DSL * Upgrade ohai to 7.0.0.rc.0 +* Make the initial bootstrap message more user friendly (CHEF-5102) ## Last Release: 11.10.0 (02/06/2014) diff --git a/lib/chef/knife/bootstrap.rb b/lib/chef/knife/bootstrap.rb index 14dccb3892..a7c10fc608 100644 --- a/lib/chef/knife/bootstrap.rb +++ b/lib/chef/knife/bootstrap.rb @@ -201,7 +201,7 @@ class Chef $stdout.sync = true - ui.info("Bootstrapping Chef on #{ui.color(@node_name, :bold)}") + ui.info("Connecting to #{ui.color(@node_name, :bold)}") begin knife_ssh.run diff --git a/lib/chef/knife/bootstrap/chef-full.erb b/lib/chef/knife/bootstrap/chef-full.erb index 24ffca2c69..1d75117b72 100644 --- a/lib/chef/knife/bootstrap/chef-full.erb +++ b/lib/chef/knife/bootstrap/chef-full.erb @@ -23,6 +23,7 @@ install_sh="https://www.opscode.com/chef/install.sh" version_string="-v <%= chef_version %>" if ! exists /usr/bin/chef-client; then + echo "Installing Chef Client..." if exists wget; then bash <(wget <%= "--proxy=on " if knife_config[:bootstrap_proxy] %> ${install_sh} -O -) ${version_string} elif exists curl; then @@ -66,4 +67,6 @@ cat > /etc/chef/first-boot.json <<'EOP' <%= first_boot.to_json %> EOP +echo "Starting first Chef Client run..." + <%= start_chef %>' |