Skip to content

Commit 9ecf211

Browse files
committed
Bugfix #18588: Update knife.rb when chef-client
1 parent 8497e5d commit 9ecf211

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

resources/recipes/configure.rb

+18
Original file line numberDiff line numberDiff line change
@@ -232,3 +232,21 @@
232232
mode '0440'
233233
retries 2
234234
end
235+
236+
ruby_block 'update_knife_rb' do
237+
block do
238+
knife_rb_path = '/root/.chef/knife.rb'
239+
if node.chef_environment && File.exist?(knife_rb_path)
240+
env_setting = "environment '#{node.chef_environment}'"
241+
242+
file_content = File.read(knife_rb_path)
243+
if file_content.match(/^environment\s+".+"/)
244+
new_content = file_content.gsub(/^environment\s+".+"/, env_setting)
245+
else
246+
new_content = file_content + "\n" + env_setting
247+
end
248+
File.write(knife_rb_path, new_content)
249+
end
250+
end
251+
action :run
252+
end

0 commit comments

Comments
 (0)