diff options
author | Seth Chisamore <schisamo@opscode.com> | 2011-06-21 16:28:38 -0400 |
---|---|---|
committer | Bryan McLellan <btm@opscode.com> | 2011-09-30 07:38:57 -0700 |
commit | da56fb5e89d531661061742bada3c32a72257e13 (patch) | |
tree | 4c99f13bdade5949c2ff4961e6fc7dbc7a51069b /chef/lib/chef/knife/bootstrap | |
parent | 73c034242840ae59b6e98bd4c8bd2f2ac208a5a2 (diff) | |
download | chef-da56fb5e89d531661061742bada3c32a72257e13.tar.gz |
[CHEF-2434] add encrypted_data_bag_secret support to bootstrap subcommand
Diffstat (limited to 'chef/lib/chef/knife/bootstrap')
-rw-r--r-- | chef/lib/chef/knife/bootstrap/archlinux-gems.erb | 10 | ||||
-rw-r--r-- | chef/lib/chef/knife/bootstrap/centos5-gems.erb | 10 | ||||
-rw-r--r-- | chef/lib/chef/knife/bootstrap/fedora13-gems.erb | 10 | ||||
-rw-r--r-- | chef/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb | 10 | ||||
-rw-r--r-- | chef/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb | 10 |
5 files changed, 50 insertions, 0 deletions
diff --git a/chef/lib/chef/knife/bootstrap/archlinux-gems.erb b/chef/lib/chef/knife/bootstrap/archlinux-gems.erb index b23a3ff3df..a496d61344 100644 --- a/chef/lib/chef/knife/bootstrap/archlinux-gems.erb +++ b/chef/lib/chef/knife/bootstrap/archlinux-gems.erb @@ -18,6 +18,16 @@ EOP awk NF /tmp/validation.pem > /etc/chef/validation.pem rm /tmp/validation.pem +<% if @chef_config[:encrypted_data_bag_secret] -%> +( +cat <<'EOP' +<%= encrypted_data_bag_secret %> +EOP +) > /tmp/encrypted_data_bag_secret +awk NF /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret +rm /tmp/encrypted_data_bag_secret +<% end -%> + ( cat <<'EOP' log_level :info diff --git a/chef/lib/chef/knife/bootstrap/centos5-gems.erb b/chef/lib/chef/knife/bootstrap/centos5-gems.erb index cfaf9876a8..ae95980271 100644 --- a/chef/lib/chef/knife/bootstrap/centos5-gems.erb +++ b/chef/lib/chef/knife/bootstrap/centos5-gems.erb @@ -30,6 +30,16 @@ EOP awk NF /tmp/validation.pem > /etc/chef/validation.pem rm /tmp/validation.pem +<% if @chef_config[:encrypted_data_bag_secret] -%> +( +cat <<'EOP' +<%= encrypted_data_bag_secret %> +EOP +) > /tmp/encrypted_data_bag_secret +awk NF /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret +rm /tmp/encrypted_data_bag_secret +<% end -%> + ( cat <<'EOP' <%= config_content %> diff --git a/chef/lib/chef/knife/bootstrap/fedora13-gems.erb b/chef/lib/chef/knife/bootstrap/fedora13-gems.erb index b9819f20f2..490dcb9340 100644 --- a/chef/lib/chef/knife/bootstrap/fedora13-gems.erb +++ b/chef/lib/chef/knife/bootstrap/fedora13-gems.erb @@ -18,6 +18,16 @@ EOP awk NF /tmp/validation.pem > /etc/chef/validation.pem rm /tmp/validation.pem +<% if @chef_config[:encrypted_data_bag_secret] -%> +( +cat <<'EOP' +<%= encrypted_data_bag_secret %> +EOP +) > /tmp/encrypted_data_bag_secret +awk NF /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret +rm /tmp/encrypted_data_bag_secret +<% end -%> + ( cat <<'EOP' <%= config_content %> diff --git a/chef/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb b/chef/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb index 67206dfaae..b0b745d659 100644 --- a/chef/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb +++ b/chef/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb @@ -17,6 +17,16 @@ EOP awk NF /tmp/validation.pem > /etc/chef/validation.pem rm /tmp/validation.pem +<% if @chef_config[:encrypted_data_bag_secret] -%> +( +cat <<'EOP' +<%= encrypted_data_bag_secret %> +EOP +) > /tmp/encrypted_data_bag_secret +awk NF /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret +rm /tmp/encrypted_data_bag_secret +<% end -%> + <% unless @chef_config[:validation_client_name] == "chef-validator" -%> [ `grep -qx "validation_client_name \"<%= @chef_config[:validation_client_name] %>\"" /etc/chef/client.rb` ] || echo "validation_client_name \"<%= @chef_config[:validation_client_name] %>\"" >> /etc/chef/client.rb <% end -%> diff --git a/chef/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb b/chef/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb index bfbb51ecb8..1fe5f2e5ba 100644 --- a/chef/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb +++ b/chef/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb @@ -25,6 +25,16 @@ EOP awk NF /tmp/validation.pem > /etc/chef/validation.pem rm /tmp/validation.pem +<% if @chef_config[:encrypted_data_bag_secret] -%> +( +cat <<'EOP' +<%= encrypted_data_bag_secret %> +EOP +) > /tmp/encrypted_data_bag_secret +awk NF /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret +rm /tmp/encrypted_data_bag_secret +<% end -%> + ( cat <<'EOP' <%= config_content %> |