From 6039ad46f9c5fa24b27e698effce072f25049960 Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Wed, 27 Sep 2017 17:01:21 +0200 Subject: [PATCH] Restart services after a change in the external ceph configuration Change-Id: I6b6114e85a4df82458c441f471929513c2526c23 --- ansible/roles/cinder/tasks/external_ceph.yml | 7 +++++++ ansible/roles/glance/tasks/external_ceph.yml | 2 ++ ansible/roles/gnocchi/tasks/external_ceph.yml | 8 ++++++++ ansible/roles/nova/tasks/external_ceph.yml | 10 ++++++++++ 4 files changed, 27 insertions(+) diff --git a/ansible/roles/cinder/tasks/external_ceph.yml b/ansible/roles/cinder/tasks/external_ceph.yml index 4d64963863..b0ff3b22ce 100644 --- a/ansible/roles/cinder/tasks/external_ceph.yml +++ b/ansible/roles/cinder/tasks/external_ceph.yml @@ -28,6 +28,9 @@ - inventory_hostname in groups[item.value.group] - item.key in services_need_config with_dict: "{{ cinder_services }}" + notify: + - Restart cinder-volume container + - Restart cinder-backup container - name: Copy over Ceph keyring files for cinder-volume copy: @@ -39,6 +42,8 @@ - external_ceph_cephx_enabled | bool - inventory_hostname in groups['cinder-volume'] - cinder_services['cinder-volume'].enabled | bool + notify: + - Restart cinder-volume container - name: Copy over Ceph keyring files for cinder-backup copy: @@ -50,3 +55,5 @@ - external_ceph_cephx_enabled | bool - inventory_hostname in groups['cinder-backup'] - cinder_services['cinder-backup'].enabled | bool + notify: + - Restart cinder-backup container diff --git a/ansible/roles/glance/tasks/external_ceph.yml b/ansible/roles/glance/tasks/external_ceph.yml index 0eeb588296..536e08ce02 100644 --- a/ansible/roles/glance/tasks/external_ceph.yml +++ b/ansible/roles/glance/tasks/external_ceph.yml @@ -13,6 +13,8 @@ mode: "0660" with_fileglob: - "{{ node_custom_config }}/glance/ceph*" + notify: + - Restart glance-api container - name: Ensuring config directory has correct owner and permission become: true diff --git a/ansible/roles/gnocchi/tasks/external_ceph.yml b/ansible/roles/gnocchi/tasks/external_ceph.yml index 1d8ee098db..3ff59696d7 100644 --- a/ansible/roles/gnocchi/tasks/external_ceph.yml +++ b/ansible/roles/gnocchi/tasks/external_ceph.yml @@ -18,6 +18,10 @@ - "gnocchi-api" - "gnocchi-metricd" - "gnocchi-statsd" + notify: + - Restart gnocchi-api container + - Restart gnocchi-metricd container + - Restart gnocchi-statsd container - name: Copy over ceph gnocchi keyring copy: @@ -28,3 +32,7 @@ - "gnocchi-api" - "gnocchi-metricd" - "gnocchi-statsd" + notify: + - Restart gnocchi-api container + - Restart gnocchi-metricd container + - Restart gnocchi-statsd container diff --git a/ansible/roles/nova/tasks/external_ceph.yml b/ansible/roles/nova/tasks/external_ceph.yml index 7071791d79..700dbcbd0f 100644 --- a/ansible/roles/nova/tasks/external_ceph.yml +++ b/ansible/roles/nova/tasks/external_ceph.yml @@ -37,6 +37,9 @@ when: - inventory_hostname in groups['compute'] - external_ceph_cephx_enabled | bool + notify: + - Restart nova-compute container + - Restart nova-libvirt container - name: Copy over ceph.conf copy: @@ -47,6 +50,9 @@ - nova-compute - nova-libvirt when: inventory_hostname in groups['compute'] + notify: + - Restart nova-compute container + - Restart nova-libvirt container - name: Pushing nova secret xml for libvirt template: @@ -63,6 +69,8 @@ - uuid: "{{ cinder_rbd_secret_uuid }}" name: "client.cinder secret" enabled: "{{ cinder_backend_ceph }}" + notify: + - Restart nova-libvirt container - name: Extract nova key from file local_action: shell cat "{{ nova_cephx_keyring_file.stat.path }}" | grep -E 'key\s*=' | awk '{ print $3 }' @@ -94,6 +102,8 @@ - uuid: "{{ cinder_rbd_secret_uuid }}" content: "{{ cinder_cephx_raw_key.stdout }}" enabled: "{{ cinder_backend_ceph }}" + notify: + - Restart nova-libvirt container - name: Ensuring config directory has correct owner and permission become: true