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>
40 lines
1.4 KiB
Django/Jinja
40 lines
1.4 KiB
Django/Jinja
{% set apache_conf_dir = 'apache2/conf-enabled' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd/conf.d' %}
|
|
{% set apache_cmd = 'apache2' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd' %}
|
|
{
|
|
"command": "{{ apache_cmd }} -DFOREGROUND",
|
|
"config_files": [
|
|
{% if groups['ironic-inspector'] | length > 0 %}
|
|
{
|
|
"source": "{{ container_config_directory }}/ironic-agent.kernel",
|
|
"dest": "/var/lib/ironic/httpboot/ironic-agent.kernel",
|
|
"owner": "root",
|
|
"perm": "0644"
|
|
},
|
|
{
|
|
"source": "{{ container_config_directory }}/ironic-agent.initramfs",
|
|
"dest": "/var/lib/ironic/httpboot/ironic-agent.initramfs",
|
|
"owner": "root",
|
|
"perm": "0644"
|
|
},
|
|
{
|
|
"source": "{{ container_config_directory }}/inspector.ipxe",
|
|
"dest": "/var/lib/ironic/httpboot/inspector.ipxe",
|
|
"owner": "root",
|
|
"perm": "0644"
|
|
},
|
|
{% endif %}
|
|
{
|
|
"source": "{{ container_config_directory }}/httpd.conf",
|
|
"dest": "/etc/{{ apache_conf_dir }}/httpboot.conf",
|
|
"owner": "root",
|
|
"perm": "0644"
|
|
}{% if ironic_copy_certs | bool %},
|
|
{
|
|
"source": "{{ container_config_directory }}/ca-certificates",
|
|
"dest": "/var/lib/kolla/share/ca-certificates",
|
|
"owner": "root",
|
|
"perm": "0600"
|
|
}{% endif %}
|
|
]
|
|
}
|