006ff07185
This is a prerequisite for patchset #745164 This fixes unwanted restarts during copying of certificates. By removing conditional statements from role handlers in #745164, copying certificates caused containers to restart, this is unwanted during the genconfig process. However, if we would remove handler notifiers from copying certificates, the container would never restart, since from #745164, containers will restart only if any of the files specified in config.json change. Certificates are now copied to intermediary location inside of the container, from which the script kolla_copy_cacerts will install them in the trust store. Depends-on: https://review.opendev.org/c/openstack/kolla/+/926882 Change-Id: Ib89048c7e0f250182c4bf57d8c8a1b5478e9b4ab Signed-off-by: Roman Krček <roman.krcek@tietoevry.com>
45 lines
1.7 KiB
Django/Jinja
45 lines
1.7 KiB
Django/Jinja
{
|
|
"command": "neutron-linuxbridge-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/linuxbridge_agent.ini",
|
|
"config_files": [
|
|
{
|
|
"source": "{{ container_config_directory }}/neutron.conf",
|
|
"dest": "/etc/neutron/neutron.conf",
|
|
"owner": "neutron",
|
|
"perm": "0600"
|
|
},
|
|
{% if neutron_policy_file is defined %}{
|
|
"source": "{{ container_config_directory }}/{{ neutron_policy_file }}",
|
|
"dest": "/etc/neutron/{{ neutron_policy_file }}",
|
|
"owner": "neutron",
|
|
"perm": "0600"
|
|
},{% endif %}
|
|
{% if check_extra_ml2_plugins is defined and check_extra_ml2_plugins.matched > 0 %}{% for plugin in check_extra_ml2_plugins.files %}
|
|
{
|
|
"source": "{{ container_config_directory }}/{{ plugin.path | basename }}",
|
|
"dest": "/etc/neutron/plugins/ml2/{{ plugin.path | basename }}",
|
|
"owner": "neutron",
|
|
"perm": "0600"
|
|
},
|
|
{% endfor %}{% endif %}
|
|
{
|
|
"source": "{{ container_config_directory }}/linuxbridge_agent.ini",
|
|
"dest": "/etc/neutron/plugins/ml2/linuxbridge_agent.ini",
|
|
"owner": "neutron",
|
|
"perm": "0600"
|
|
}{% if neutron_copy_certs | bool %},
|
|
{
|
|
"source": "{{ container_config_directory }}/ca-certificates",
|
|
"dest": "/var/lib/kolla/share/ca-certificates",
|
|
"owner": "root",
|
|
"perm": "0600"
|
|
}{% endif %}
|
|
],
|
|
"permissions": [
|
|
{
|
|
"path": "/var/log/kolla/neutron",
|
|
"owner": "neutron:neutron",
|
|
"recurse": true
|
|
}
|
|
]
|
|
}
|