diff options
| author | Roman Krček <roman.krcek@tietoevry.com> | 2024-07-22 16:57:51 +0200 |
|---|---|---|
| committer | Michal Arbet <michal.arbet@ultimum.io> | 2024-12-01 22:16:25 +0100 |
| commit | 006ff0718540fe790bfb257dbc8a87eacb96d1bf (patch) | |
| tree | 62968c74b838e6b3ca9788c8bcf98645a29834e1 /ansible/roles/tacker | |
| parent | d3a41c88399abfab7654db041e6dcc0a48288e72 (diff) | |
| download | kolla-ansible-006ff0718540fe790bfb257dbc8a87eacb96d1bf.tar.gz kolla-ansible-006ff0718540fe790bfb257dbc8a87eacb96d1bf.zip | |
Don't notify handlers during copy-cert
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>
Diffstat (limited to 'ansible/roles/tacker')
| -rw-r--r-- | ansible/roles/tacker/templates/tacker-conductor.json.j2 | 6 | ||||
| -rw-r--r-- | ansible/roles/tacker/templates/tacker-server.json.j2 | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/ansible/roles/tacker/templates/tacker-conductor.json.j2 b/ansible/roles/tacker/templates/tacker-conductor.json.j2 index 009e64aca..02cc0ef09 100644 --- a/ansible/roles/tacker/templates/tacker-conductor.json.j2 +++ b/ansible/roles/tacker/templates/tacker-conductor.json.j2 @@ -12,6 +12,12 @@ "dest": "/etc/tacker/{{ tacker_policy_file }}", "owner": "tacker", "perm": "0600" + }{% endif %}{% 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 %} ], "permissions": [ diff --git a/ansible/roles/tacker/templates/tacker-server.json.j2 b/ansible/roles/tacker/templates/tacker-server.json.j2 index b2b17f90f..950d63dc2 100644 --- a/ansible/roles/tacker/templates/tacker-server.json.j2 +++ b/ansible/roles/tacker/templates/tacker-server.json.j2 @@ -12,6 +12,12 @@ "dest": "/etc/tacker/{{ tacker_policy_file }}", "owner": "tacker", "perm": "0600" + }{% endif %}{% 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 %} ], "permissions": [ |