diff options
| -rw-r--r-- | ansible/roles/cinder/defaults/main.yml | 7 | ||||
| -rw-r--r-- | ansible/roles/cinder/tasks/upgrade.yml | 14 |
2 files changed, 14 insertions, 7 deletions
diff --git a/ansible/roles/cinder/defaults/main.yml b/ansible/roles/cinder/defaults/main.yml index e6dfcb362..e2a2d2dd6 100644 --- a/ansible/roles/cinder/defaults/main.yml +++ b/ansible/roles/cinder/defaults/main.yml @@ -357,13 +357,6 @@ cinder_ks_services: endpoints: - {'interface': 'internal', 'url': '{{ cinder_internal_endpoint }}'} - {'interface': 'public', 'url': '{{ cinder_public_endpoint }}'} - # TODO(mattcrees): switch to absent in G-cycle, remove in H - - name: "cinderv3" - type: "volumev3" - description: "Openstack Block Storage (deprecated)" - endpoints: - - {'interface': 'internal', 'url': '{{ cinder_v3_internal_endpoint }}'} - - {'interface': 'public', 'url': '{{ cinder_v3_public_endpoint }}'} cinder_ks_users: - project: "service" diff --git a/ansible/roles/cinder/tasks/upgrade.yml b/ansible/roles/cinder/tasks/upgrade.yml index 5b395b1c0..7a872aecb 100644 --- a/ansible/roles/cinder/tasks/upgrade.yml +++ b/ansible/roles/cinder/tasks/upgrade.yml @@ -20,6 +20,20 @@ - name: Reload cinder services ansible.builtin.import_tasks: reload.yml +# TODO(mnasiadka): Remove me in 2026.2 +- name: Remove cinderv3 catalog entries + vars: + _cinder_volumev3: + - name: "cinderv3" + type: "volumev3" + description: "Openstack Block Storage (deprecated)" + endpoints: [] + state: absent + service_ks_register_auth: "{{ openstack_cinder_auth }}" + service_ks_register_services: "{{ _cinder_volumev3 }}" + ansible.builtin.import_role: + name: service-ks-register + - name: Running Cinder online schema migration vars: cinder_api: "{{ cinder_services['cinder-api'] }}" |