openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix modify external ceph.conf not restart related containers"

Browse Source
This commit is contained in:
Jenkins 2017-08-23 15:43:03 +00:00 committed by Gerrit Code Review
commit 4754ae80f6
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/cinder/handlers/main.yml
View File

@ -50,6 +50,7 @@
vars:
service_name: "cinder-volume"
service: "{{ cinder_services[service_name] }}"
ceph_config: "{{ cinder_ceph_configs.results|selectattr('item.key', 'equalto', service_name)|first }}"
config_json: "{{ cinder_config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
cinder_conf: "{{ cinder_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
policy_json: "{{ cinder_policy_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
@ -70,11 +71,13 @@
or cinder_conf.changed | bool
or policy_json.changed | bool
or cinder_volume_container.changed | bool
or ceph_config.changed | bool
- name: Restart cinder-backup container
vars:
service_name: "cinder-backup"
service: "{{ cinder_services[service_name] }}"
ceph_config: "{{ cinder_ceph_configs.results|selectattr('item.key', 'equalto', service_name)|first }}"
config_json: "{{ cinder_config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
cinder_conf: "{{ cinder_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
policy_json: "{{ cinder_policy_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
@ -94,3 +97,4 @@
or cinder_conf.changed | bool
or policy_json.changed | bool
or cinder_backup_container.changed | bool
or ceph_config.changed | bool

4
ansible/roles/cinder/tasks/ceph.yml
View File

@ -29,6 +29,10 @@
- inventory_hostname in groups[item.value.group]
- item.key in services_need_config
with_dict: "{{ cinder_services }}"
register: cinder_ceph_configs
notify:
- Restart cinder-volume container
- Restart cinder-backup container
- include: ../../ceph_pools.yml
vars:

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

@ -28,6 +28,10 @@
- inventory_hostname in groups[item.value.group]
- item.key in services_need_config
with_dict: "{{ cinder_services }}"
register: cinder_ceph_configs
notify:
- Restart cinder-volume container
- Restart cinder-backup container
- name: Copy over Ceph keyring files for cinder-volume
copy: