From 9a8ea212c0dbf77e08d43fc75cb65c6ed488ce10 Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <dmitriy.rabotyagov@citynetwork.eu>
Date: Tue, 14 Jun 2022 11:16:07 +0200
Subject: [PATCH] Forcefully remove Cinder v2 endpoints

Nowadays Cinder does not support v2 api so it makes sense to ensure
that these endpoints or service is not present in catalog.

Change-Id: I62a4ba182cc752a5bc4f6e8c4d2430f7e7aafe54
---
 defaults/main.yml                                         | 3 ---
 .../notes/remove_cinderv2_api-a9e848a63c055bb2.yaml       | 6 ++++++
 vars/main.yml                                             | 8 ++++----
 3 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 releasenotes/notes/remove_cinderv2_api-a9e848a63c055bb2.yaml

diff --git a/defaults/main.yml b/defaults/main.yml
index 30cab296..c58c284a 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -136,9 +136,6 @@ cinder_lock_dir: "{{ openstack_lock_dir | default('/run/lock') }}"
 cinder_service_admin_tenant_name: "service"
 cinder_service_admin_username: "cinder"
 
-## Cinder API's enabled
-cinder_enable_v2_api: false
-
 ## Cinder api service type and data
 cinder_service_name: cinder
 cinder_service_project_domain_id: default
diff --git a/releasenotes/notes/remove_cinderv2_api-a9e848a63c055bb2.yaml b/releasenotes/notes/remove_cinderv2_api-a9e848a63c055bb2.yaml
new file mode 100644
index 00000000..ab92092a
--- /dev/null
+++ b/releasenotes/notes/remove_cinderv2_api-a9e848a63c055bb2.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    Cinder v2 API is now fully removed from Cinder service.
+    With that os_cinder role ensures v2 endpoint is not present anymore in
+    the catalog and remove endpoints if they're present.
diff --git a/vars/main.yml b/vars/main.yml
index 3ee26744..1ea83199 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -85,15 +85,15 @@ cinder_service_endpoints:
   - service: "{{ cinder_service_v2_name }}"
     interface: "public"
     url: "{{ cinder_service_v2_publicurl }}"
-    state: "{{ (cinder_enable_v2_api | bool) | ternary('present', 'absent') }}"
+    state: "absent"
   - service: "{{ cinder_service_v2_name }}"
     interface: "internal"
     url: "{{ cinder_service_v2_internalurl }}"
-    state: "{{ (cinder_enable_v2_api | bool) | ternary('present', 'absent') }}"
+    state: "absent"
   - service: "{{ cinder_service_v2_name }}"
     interface: "admin"
     url: "{{ cinder_service_v2_adminurl }}"
-    state: "{{ (cinder_enable_v2_api | bool) | ternary('present', 'absent') }}"
+    state: "absent"
   - service: "{{ cinder_service_v3_name }}"
     interface: "public"
     url: "{{ cinder_service_v3_publicurl }}"
@@ -115,7 +115,7 @@ cinder_service_catalog:
   - name: "{{ cinder_service_v2_name }}"
     type: "{{ cinder_service_v2_type }}"
     description: "{{ cinder_service_v2_description }}"
-    state: "{{ (cinder_enable_v2_api | bool) | ternary('present', 'absent') }}"
+    state: "absent"
   - name: "{{ cinder_service_v3_name }}"
     type: "{{ cinder_service_v3_type }}"
     description: "{{ cinder_service_v3_description }}"