openstack/kolla-ansible
Code Issues Proposed changes

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

Browse Source 
This reverts commit 0ec2bf39ef.

Change-Id: I6e02b2bc15ccda8039850fc5827b3b5e4323e679
Closes-Bug: #1713926
This commit is contained in:
Bertrand Lallau 2017-08-30 09:18:31 +02:00
parent de61c89014
commit c751a4f780
3 changed files with 0 additions and 12 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,7 +50,6 @@
vars: vars:
service_name: "cinder-volume" service_name: "cinder-volume"
service: "{{ cinder_services[service_name] }}" 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 }}" 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 }}" 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 }}" policy_json: "{{ cinder_policy_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
@ -71,13 +70,11 @@
or cinder_conf.changed | bool or cinder_conf.changed | bool
or policy_json.changed | bool or policy_json.changed | bool
or cinder_volume_container.changed | bool or cinder_volume_container.changed | bool
or ceph_config.changed | bool
- name: Restart cinder-backup container - name: Restart cinder-backup container
vars: vars:
service_name: "cinder-backup" service_name: "cinder-backup"
service: "{{ cinder_services[service_name] }}" 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 }}" 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 }}" 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 }}" policy_json: "{{ cinder_policy_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
@ -97,4 +94,3 @@
or cinder_conf.changed | bool or cinder_conf.changed | bool
or policy_json.changed | bool or policy_json.changed | bool
or cinder_backup_container.changed | bool or cinder_backup_container.changed | bool
or ceph_config.changed | bool

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

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

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

@ -28,10 +28,6 @@
- inventory_hostname in groups[item.value.group] - inventory_hostname in groups[item.value.group]
- item.key in services_need_config - item.key in services_need_config
with_dict: "{{ cinder_services }}" 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 - name: Copy over Ceph keyring files for cinder-volume
copy: copy: