Skip to content

Commit b6cd9db

Browse files
m-bullAlex-Welsh
authored andcommitted
Only notify handlers in service-check-containers
Notification of handlers on service config change is now mostly delegated to the service-check-containers role, but handlers that restart nova_libvirt and ovn_sb_db_relays still remain. Remove these remaining handlers to ensure that all service containers are restarted by service-check-containers. Partial-Bug: #2123946 Change-Id: I57a51fb46cb7c58074044bac76b1160620086cb8 Signed-off-by: Matt Anson <[email protected]> (cherry picked from commit bb15619)
1 parent e60355d commit b6cd9db

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

ansible/roles/nova-cell/tasks/external_ceph.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,6 @@
200200
# reload. This may be due to differences in tested versions of libvirt
201201
# (8.0.0 vs 6.0.0). Reload should be low overhead, so do it always.
202202
libvirt_restart_handlers: >-
203-
{{ ['Restart nova-libvirt container']
204-
if enable_nova_libvirt_container | bool else
205-
['Reload libvirtd'] }}
203+
{{ ['Reload libvirtd']
204+
if not enable_nova_libvirt_container | bool else
205+
[] }}

ansible/roles/ovn-db/tasks/config-relay.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
dest: "{{ node_config_directory }}/ovn-sb-db-relay-{{ item }}/config.json"
2020
mode: "0660"
2121
become: true
22-
notify:
23-
- Restart ovn-sb-db-relay container
2422

2523
- name: Generate config files for OVN relay services
2624
vars:
@@ -31,5 +29,3 @@
3129
dest: "{{ node_config_directory }}/ovn-sb-db-relay-{{ item }}/ovsdb-relay.json"
3230
mode: "0660"
3331
become: true
34-
notify:
35-
- Restart ovn-sb-db-relay container
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
fixes:
3+
- |
4+
Handlers to trigger a restart nova_libvirt and ovn_sb_db_relay
5+
containers have been removed and restarts of these services
6+
are now under the control of the service-check-containers
7+
role `LP#2123946 <https://bugs.launchpad.net/kolla-ansible/+bug/2123946>`__.

0 commit comments

Comments
 (0)