diff options
| author | Sean Horn <sean_horn@opscode.com> | 2013-03-14 12:04:45 -0400 |
|---|---|---|
| committer | Bryan McLellan <btm@opscode.com> | 2013-05-24 08:05:56 -0700 |
| commit | 663c7dafdbdf833af331c7a1758af990fa7834be (patch) | |
| tree | b41a6ce0a53ceb486c394dc706b0eae192e546d7 /lib/chef/knife | |
| parent | b70b8b8ea51a2403520ff530cd4a3c1480559245 (diff) | |
| download | chef-663c7dafdbdf833af331c7a1758af990fa7834be.tar.gz | |
[CHEF-3471] awk not needed for bootstrap templates
Diffstat (limited to 'lib/chef/knife')
| -rw-r--r-- | lib/chef/knife/bootstrap/archlinux-gems.erb | 4 | ||||
| -rw-r--r-- | lib/chef/knife/bootstrap/centos5-gems.erb | 4 | ||||
| -rw-r--r-- | lib/chef/knife/bootstrap/chef-full.erb | 4 | ||||
| -rw-r--r-- | lib/chef/knife/bootstrap/fedora13-gems.erb | 4 | ||||
| -rw-r--r-- | lib/chef/knife/bootstrap/ubuntu10.04-apt.erb | 4 | ||||
| -rw-r--r-- | lib/chef/knife/bootstrap/ubuntu10.04-gems.erb | 4 | ||||
| -rw-r--r-- | lib/chef/knife/bootstrap/ubuntu12.04-gems.erb | 4 |
7 files changed, 14 insertions, 14 deletions
diff --git a/lib/chef/knife/bootstrap/archlinux-gems.erb b/lib/chef/knife/bootstrap/archlinux-gems.erb index 509c469f41..c4f4eca789 100644 --- a/lib/chef/knife/bootstrap/archlinux-gems.erb +++ b/lib/chef/knife/bootstrap/archlinux-gems.erb @@ -11,13 +11,13 @@ fi mkdir -p /etc/chef -awk NF > /etc/chef/validation.pem <<'EOP' +cat > /etc/chef/validation.pem <<'EOP' <%= validation_key %> EOP chmod 0600 /etc/chef/validation.pem <% if encrypted_data_bag_secret -%> -awk NF > /etc/chef/encrypted_data_bag_secret <<'EOP' +cat > /etc/chef/encrypted_data_bag_secret <<'EOP' <%= encrypted_data_bag_secret %> EOP chmod 0600 /etc/chef/encrypted_data_bag_secret diff --git a/lib/chef/knife/bootstrap/centos5-gems.erb b/lib/chef/knife/bootstrap/centos5-gems.erb index 310e8eb0e1..6aacc47179 100644 --- a/lib/chef/knife/bootstrap/centos5-gems.erb +++ b/lib/chef/knife/bootstrap/centos5-gems.erb @@ -28,13 +28,13 @@ gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string %> mkdir -p /etc/chef -awk NF > /etc/chef/validation.pem <<'EOP' +cat > /etc/chef/validation.pem <<'EOP' <%= validation_key %> EOP chmod 0600 /etc/chef/validation.pem <% if encrypted_data_bag_secret -%> -awk NF > /etc/chef/encrypted_data_bag_secret <<'EOP' +cat > /etc/chef/encrypted_data_bag_secret <<'EOP' <%= encrypted_data_bag_secret %> EOP chmod 0600 /etc/chef/encrypted_data_bag_secret diff --git a/lib/chef/knife/bootstrap/chef-full.erb b/lib/chef/knife/bootstrap/chef-full.erb index 356a7e2b52..fe08c88a49 100644 --- a/lib/chef/knife/bootstrap/chef-full.erb +++ b/lib/chef/knife/bootstrap/chef-full.erb @@ -26,13 +26,13 @@ fi mkdir -p /etc/chef -awk NF > /etc/chef/validation.pem <<'EOP' +cat > /etc/chef/validation.pem <<'EOP' <%= validation_key %> EOP chmod 0600 /etc/chef/validation.pem <% if encrypted_data_bag_secret -%> -awk NF > /etc/chef/encrypted_data_bag_secret <<'EOP' +cat > /etc/chef/encrypted_data_bag_secret <<'EOP' <%= encrypted_data_bag_secret %> EOP chmod 0600 /etc/chef/encrypted_data_bag_secret diff --git a/lib/chef/knife/bootstrap/fedora13-gems.erb b/lib/chef/knife/bootstrap/fedora13-gems.erb index c4073aef55..0aabc31085 100644 --- a/lib/chef/knife/bootstrap/fedora13-gems.erb +++ b/lib/chef/knife/bootstrap/fedora13-gems.erb @@ -10,13 +10,13 @@ gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string %> mkdir -p /etc/chef -awk NF > /etc/chef/validation.pem <<'EOP' +cat > /etc/chef/validation.pem <<'EOP' <%= validation_key %> EOP chmod 0600 /etc/chef/validation.pem <% if encrypted_data_bag_secret -%> -awk NF > /etc/chef/encrypted_data_bag_secret <<'EOP' +cat > /etc/chef/encrypted_data_bag_secret <<'EOP' <%= encrypted_data_bag_secret %> EOP chmod 0600 /etc/chef/encrypted_data_bag_secret diff --git a/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb b/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb index 60978f4484..4549b94d2b 100644 --- a/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb +++ b/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb @@ -10,13 +10,13 @@ fi apt-get update apt-get install -y chef -awk NF > /etc/chef/validation.pem <<'EOP' +cat > /etc/chef/validation.pem <<'EOP' <%= validation_key %> EOP chmod 0600 /etc/chef/validation.pem <% if encrypted_data_bag_secret -%> -awk NF > /etc/chef/encrypted_data_bag_secret <<'EOP' +cat > /etc/chef/encrypted_data_bag_secret <<'EOP' <%= encrypted_data_bag_secret %> EOP chmod 0600 /etc/chef/encrypted_data_bag_secret diff --git a/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb b/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb index 864d790f9c..62ff7c857e 100644 --- a/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb +++ b/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb @@ -14,13 +14,13 @@ gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string %> mkdir -p /etc/chef -awk NF > /etc/chef/validation.pem <<'EOP' +cat > /etc/chef/validation.pem <<'EOP' <%= validation_key %> EOP chmod 0600 /etc/chef/validation.pem <% if encrypted_data_bag_secret -%> -awk NF > /etc/chef/encrypted_data_bag_secret <<'EOP' +cat > /etc/chef/encrypted_data_bag_secret <<'EOP' <%= encrypted_data_bag_secret %> EOP chmod 0600 /etc/chef/encrypted_data_bag_secret diff --git a/lib/chef/knife/bootstrap/ubuntu12.04-gems.erb b/lib/chef/knife/bootstrap/ubuntu12.04-gems.erb index 2b1e06fc13..8e9c6583d0 100644 --- a/lib/chef/knife/bootstrap/ubuntu12.04-gems.erb +++ b/lib/chef/knife/bootstrap/ubuntu12.04-gems.erb @@ -12,13 +12,13 @@ gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string %> mkdir -p /etc/chef -awk NF > /etc/chef/validation.pem <<'EOP' +cat > /etc/chef/validation.pem <<'EOP' <%= validation_key %> EOP chmod 0600 /etc/chef/validation.pem <% if encrypted_data_bag_secret -%> -awk NF > /etc/chef/encrypted_data_bag_secret <<'EOP' +cat > /etc/chef/encrypted_data_bag_secret <<'EOP' <%= encrypted_data_bag_secret %> EOP chmod 0600 /etc/chef/encrypted_data_bag_secret |