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>
33 lines
1.2 KiB
Django/Jinja
33 lines
1.2 KiB
Django/Jinja
{% set cron_cmd = 'cron -f' if kolla_base_distro in ['ubuntu', 'debian'] else 'crond -s -n' %}
|
|
{% set cron_path = '/var/spool/cron/crontabs/root' if kolla_base_distro in ['ubuntu', 'debian'] else '/var/spool/cron/root' %}
|
|
{
|
|
"command": "/usr/local/bin/letsencrypt-lego-run.sh",
|
|
"config_files": [
|
|
{
|
|
"source": "{{ container_config_directory }}/letsencrypt-lego-run.sh",
|
|
"dest": "/usr/local/bin/letsencrypt-lego-run.sh",
|
|
"owner": "root",
|
|
"perm": "0700"
|
|
},
|
|
{
|
|
"source": "{{ container_config_directory }}/crontab",
|
|
"dest": "{{ cron_path }}",
|
|
"owner": "root",
|
|
"perm": "0600"
|
|
},
|
|
{
|
|
"source": "{{ container_config_directory }}/id_rsa",
|
|
"dest": "/var/lib/letsencrypt/.ssh/id_rsa",
|
|
"owner": "letsencrypt",
|
|
"perm": "0600"
|
|
}{% if kolla_copy_ca_into_containers | bool %},
|
|
{
|
|
"source": "{{ container_config_directory }}/ca-certificates",
|
|
"dest": "/var/lib/kolla/share/ca-certificates",
|
|
"owner": "root",
|
|
"perm": "0600"
|
|
}{% endif %}
|
|
]
|
|
}
|
|
|