openstack
/
cookbook-openstack-compute
Code Issues Proposed changes

Make nova.conf more readable 

This patch replaces nova.conf.erb with openstack-service.conf.erb from
the openstack-common cookbook.

Besides removing some redundancy, it also makes nova.conf more readable
(due to a fix to openstack-service.conf.erb that never made it to
nova.conf.erb).

backport: queens pike

Change-Id: I07aeb7617ca152f66ec239cef4bcbef642c66bf7
This commit is contained in:
Roger Luethi 2018-10-02 15:19:06 +02:00
parent 6ac9b3b655
commit 55b58702fa
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
recipes/nova-common.rb
View File

@ -190,11 +190,12 @@ node.default['openstack']['compute']['conf'].tap do |conf|
conf['serial_console']['proxyclient_address'] = serial_console_bind_address
end
# merge all config options and secrets to be used in the nova.conf.erb
# merge all config options and secrets to be used in nova.conf
nova_conf_options = merge_config_options 'compute'
template '/etc/nova/nova.conf' do
source 'nova.conf.erb'
source 'openstack-service.conf.erb'
cookbook 'openstack-common'
owner node['openstack']['compute']['user']
group node['openstack']['compute']['group']
mode 0o0640

12
templates/default/nova.conf.erb
View File

@ -1,12 +0,0 @@
<%= node["openstack"]["compute"]["custom_template_banner"] %>
<% @service_config.each do |section, values| -%>
[<%= section %>]
<% values.each do |key, value| -%>
<% if value.class == Hash -%>
<%= "# #{value['comment']}" -%>
<%= key %> = <%= value['set_to'] %>
<% else -%>
<%= key %> = <%= value %>
<% end -%>
<% end -%>
<% end -%>