knife-easybake 0.0.9 → 0.0.10
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/chef/knife/setup.rb +8 -8
- data/lib/knife_easybake/version.rb +1 -1
- metadata +1 -1
data/lib/chef/knife/setup.rb
CHANGED
@@ -97,9 +97,9 @@ EOM
|
|
97
97
|
|
98
98
|
# Write out client client.rb
|
99
99
|
client_rb_file = "#{File.dirname(Chef::Config[:validation_key])}/client.rb"
|
100
|
-
if File.exist?(client_rb_file)
|
101
|
-
output "client.rb file #{client_rb_file} already exists. Skipping ..."
|
102
|
-
else
|
100
|
+
# if File.exist?(client_rb_file)
|
101
|
+
# output "client.rb file #{client_rb_file} already exists. Skipping ..."
|
102
|
+
# else
|
103
103
|
output "Writing #{client_rb_file} ..."
|
104
104
|
write_file(client_rb_file, <<-EOM)
|
105
105
|
current_dir = File.dirname(__FILE__)
|
@@ -110,7 +110,7 @@ validation_client_name "#{organization}-validator"
|
|
110
110
|
chef_server_url "#{Chef::Config[:api_server_url]}/organizations/#{organization}"
|
111
111
|
client_key "\#{current_dir}/\#{Socket.gethostname}.pem"
|
112
112
|
EOM
|
113
|
-
end
|
113
|
+
# end
|
114
114
|
|
115
115
|
# Write out client validation.pem
|
116
116
|
if File.exist?(Chef::Config[:validation_key]) && !config[:regen_validator_key]
|
@@ -127,9 +127,9 @@ EOM
|
|
127
127
|
|
128
128
|
# Write out workstation knife.rb
|
129
129
|
client_rb_file = "#{Chef::Config[:chef_repo_path]}/.chef/knife.rb"
|
130
|
-
if File.exist?(client_rb_file)
|
131
|
-
output "client.rb file #{client_rb_file} already exists. Skipping ..."
|
132
|
-
else
|
130
|
+
# if File.exist?(client_rb_file)
|
131
|
+
# output "client.rb file #{client_rb_file} already exists. Skipping ..."
|
132
|
+
# else
|
133
133
|
output "Writing #{client_rb_file} ..."
|
134
134
|
write_file(client_rb_file, <<-EOM)
|
135
135
|
current_dir = File.dirname(__FILE__)
|
@@ -141,7 +141,7 @@ validation_client_name "#{organization}-validator"
|
|
141
141
|
validation_client_key "\#{current_dir}/#{organization}-validator.pem"
|
142
142
|
chef_server_url "https://api.opscode.com/organizations/#{organization}"
|
143
143
|
EOM
|
144
|
-
end
|
144
|
+
# end
|
145
145
|
|
146
146
|
# Write out workstation user.pem
|
147
147
|
user_pem_file = "#{Chef::Config[:chef_repo_path]}/.chef/#{Chef::Config[:username]}.pem"
|