diff --git a/ansible/roles/cinder/handlers/main.yml b/ansible/roles/cinder/handlers/main.yml index ec5a6091aa..485669848e 100644 --- a/ansible/roles/cinder/handlers/main.yml +++ b/ansible/roles/cinder/handlers/main.yml @@ -50,7 +50,6 @@ 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 }}" @@ -71,13 +70,11 @@ 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 }}" @@ -97,4 +94,3 @@ or cinder_conf.changed | bool or policy_json.changed | bool or cinder_backup_container.changed | bool - or ceph_config.changed | bool diff --git a/ansible/roles/cinder/tasks/ceph.yml b/ansible/roles/cinder/tasks/ceph.yml index 1e706e3924..5e2d05daad 100644 --- a/ansible/roles/cinder/tasks/ceph.yml +++ b/ansible/roles/cinder/tasks/ceph.yml @@ -29,10 +29,6 @@ - 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: diff --git a/ansible/roles/cinder/tasks/external_ceph.yml b/ansible/roles/cinder/tasks/external_ceph.yml index fbbb32e391..4d64963863 100644 --- a/ansible/roles/cinder/tasks/external_ceph.yml +++ b/ansible/roles/cinder/tasks/external_ceph.yml @@ -28,10 +28,6 @@ - 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: