openstack/kolla-ansible
Code Issues Proposed changes

Merge "Restart services after a change in the external ceph configuration"

Browse Source
This commit is contained in:
Zuul 2017-12-13 17:58:43 +00:00 committed by Gerrit Code Review
commit a9b8a392ce
4 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ansible/roles/cinder/tasks/external_ceph.yml
View File

@ -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

2
ansible/roles/glance/tasks/external_ceph.yml
View File

@ -14,6 +14,8 @@
when: inventory_hostname in groups['glance-api']
with_fileglob:
- "{{ node_custom_config }}/glance/ceph*"
notify:
- Restart glance-api container
- name: Ensuring config directory has correct owner and permission
become: true

8
ansible/roles/gnocchi/tasks/external_ceph.yml
View File

@ -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

10
ansible/roles/nova/tasks/external_ceph.yml
View File

@ -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