diff options
| author | Tim Smith <tsmith@chef.io> | 2020-06-23 11:40:53 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-23 11:40:53 -0700 |
| commit | 0f743263d1a2d5388c900f911c5d4c930e1826aa (patch) | |
| tree | d35dc0dc6d894649a046f8867be744e43bfbb8e7 | |
| parent | 6e34526cb4ac80466daa0a4c4f500d7e8a0d2ec0 (diff) | |
| parent | 2b0fa803d84053cee85edd713193687460a994df (diff) | |
| download | chef-0f743263d1a2d5388c900f911c5d4c930e1826aa.tar.gz | |
Merge pull request #10044 from chef/15_bootstrap
Use /etc/chef for bootstrapping instead of ChefConfig
| -rw-r--r-- | lib/chef/knife/bootstrap/templates/chef-full.erb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/chef/knife/bootstrap/templates/chef-full.erb b/lib/chef/knife/bootstrap/templates/chef-full.erb index 263203ca76..7743142332 100644 --- a/lib/chef/knife/bootstrap/templates/chef-full.erb +++ b/lib/chef/knife/bootstrap/templates/chef-full.erb @@ -185,50 +185,50 @@ if test "x$tmp_dir" != "x"; then rm -r "$tmp_dir" fi -mkdir -p <%= ChefConfig::Config.etc_chef_dir(false) %> +mkdir -p /etc/chef <% if client_pem -%> -(umask 077 && (cat > <%= ChefConfig::Config.etc_chef_dir(false) %>/client.pem <<'EOP' +(umask 077 && (cat > /etc/chef/client.pem <<'EOP' <%= ::File.read(::File.expand_path(client_pem)) %> EOP )) || exit 1 <% end -%> <% if validation_key -%> -(umask 077 && (cat > <%= ChefConfig::Config.etc_chef_dir(false) %>/validation.pem <<'EOP' +(umask 077 && (cat > /etc/chef/validation.pem <<'EOP' <%= validation_key %> EOP )) || exit 1 <% end -%> <% if encrypted_data_bag_secret -%> -(umask 077 && (cat > <%= ChefConfig::Config.etc_chef_dir(false) %>/encrypted_data_bag_secret <<'EOP' +(umask 077 && (cat > /etc/chef/encrypted_data_bag_secret <<'EOP' <%= encrypted_data_bag_secret %> EOP )) || exit 1 <% end -%> <% unless trusted_certs.empty? -%> -mkdir -p <%= ChefConfig::Config.etc_chef_dir(false) %>/trusted_certs +mkdir -p /etc/chef/trusted_certs <%= trusted_certs %> <% end -%> <%# Generate Ohai Hints -%> <% unless @chef_config[:knife][:hints].nil? || @chef_config[:knife][:hints].empty? -%> -mkdir -p <%= ChefConfig::Config.etc_chef_dir(false) %>/ohai/hints +mkdir -p /etc/chef/ohai/hints <% @chef_config[:knife][:hints].each do |name, hash| -%> -cat > <%= ChefConfig::Config.etc_chef_dir(false) %>/ohai/hints/<%= name %>.json <<'EOP' +cat > /etc/chef/ohai/hints/<%= name %>.json <<'EOP' <%= Chef::JSONCompat.to_json(hash) %> EOP <% end -%> <% end -%> -cat > <%= ChefConfig::Config.etc_chef_dir(false) %>/client.rb <<'EOP' +cat > /etc/chef/client.rb <<'EOP' <%= config_content %> EOP -cat > <%= ChefConfig::Config.etc_chef_dir(false) %>/first-boot.json <<'EOP' +cat > /etc/chef/first-boot.json <<'EOP' <%= Chef::JSONCompat.to_json(first_boot) %> EOP |