Remove cinder v2 references

Cinder v2 has been deprecarted and removed for a while now, so we can
safely cleanup leftovers of it now.

We also clean-up/align variable names which were not used.

Change-Id: Ie49d145775d753323406fd5588a479c60c8807cc

defaults/main.yml

@@ -186,40 +186,21 @@ cinder_service_token_roles:
   - service
 cinder_service_token_roles_required: "{{ openstack_service_token_roles_required | default(True) }}"
 cinder_service_region: "{{ service_region | default('RegionOne') }}"
-cinder_service_description: "Cinder Volume Service"
 cinder_service_port: 8776
 cinder_service_proto: http
-cinder_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(cinder_service_proto) }}"
-cinder_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(cinder_service_proto) }}"
-cinder_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(cinder_service_proto) }}"
-cinder_service_type: volume
-cinder_service_publicuri: "{{ cinder_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ cinder_service_port }}"
-cinder_service_adminuri: "{{ cinder_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ cinder_service_port }}"
-cinder_service_internaluri: "{{ cinder_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ cinder_service_port }}"
-
-cinder_service_v2_name: cinderv2
-cinder_service_v2_port: 8776
-cinder_service_v2_proto: http
-cinder_service_v2_type: volumev2
-cinder_service_v2_description: "Cinder Volume Service V2"
-cinder_service_v2_publicuri: "{{ cinder_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ cinder_service_port }}"
-cinder_service_v2_publicurl: "{{ cinder_service_publicuri }}/v2/%(tenant_id)s"
-cinder_service_v2_adminuri: "{{ cinder_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ cinder_service_port }}"
-cinder_service_v2_adminurl: "{{ cinder_service_adminuri }}/v2/%(tenant_id)s"
-cinder_service_v2_internaluri: "{{ cinder_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ cinder_service_port }}"
-cinder_service_v2_internalurl: "{{ cinder_service_internaluri }}/v2/%(tenant_id)s"
 
 cinder_service_v3_name: cinderv3
-cinder_service_v3_port: 8776
-cinder_service_v3_proto: http
 cinder_service_v3_type: volumev3
 cinder_service_v3_description: "Cinder Volume Service V3"
-cinder_service_v3_publicuri: "{{ cinder_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ cinder_service_port }}"
-cinder_service_v3_publicurl: "{{ cinder_service_publicuri }}/v3/%(tenant_id)s"
-cinder_service_v3_adminuri: "{{ cinder_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ cinder_service_port }}"
-cinder_service_v3_adminurl: "{{ cinder_service_adminuri }}/v3/%(tenant_id)s"
-cinder_service_v3_internaluri: "{{ cinder_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ cinder_service_port }}"
-cinder_service_v3_internalurl: "{{ cinder_service_internaluri }}/v3/%(tenant_id)s"
+cinder_service_v3_publicuri_proto: "{{ openstack_service_publicuri_proto | default(cinder_service_proto) }}"
+cinder_service_v3_adminuri_proto: "{{ openstack_service_adminuri_proto | default(cinder_service_proto) }}"
+cinder_service_v3_internaluri_proto: "{{ openstack_service_internaluri_proto | default(cinder_service_proto) }}"
+cinder_service_v3_publicuri: "{{ cinder_service_v3_publicuri_proto }}://{{ external_lb_vip_address }}:{{ cinder_service_port }}"
+cinder_service_v3_publicurl: "{{ cinder_service_v3_publicuri }}/v3/%(tenant_id)s"
+cinder_service_v3_adminuri: "{{ cinder_service_v3_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ cinder_service_port }}"
+cinder_service_v3_adminurl: "{{ cinder_service_v3_adminuri }}/v3/%(tenant_id)s"
+cinder_service_v3_internaluri: "{{ cinder_service_v3_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ cinder_service_port }}"
+cinder_service_v3_internalurl: "{{ cinder_service_v3_internaluri }}/v3/%(tenant_id)s"
 
 cinder_auth_strategy: keystone
 

releasenotes/notes/cinder_v2_endpoint_deprecation-869f74090121154e.yaml

@@ -0,0 +1,31 @@
+---
+
+deprecations:
+  - |
+    Following deprecated variables were removed and have no effect:
+
+      - `cinder_service_v2_name`
+      - `cinder_service_v2_port`
+      - `cinder_service_v2_proto`
+      - `cinder_service_v2_type`
+      - `cinder_service_v2_description`
+      - `cinder_service_v2_publicuri`
+      - `cinder_service_v2_publicurl`
+      - `cinder_service_v2_adminuri`
+      - `cinder_service_v2_adminurl`
+      - `cinder_service_v2_internaluri`
+      - `cinder_service_v2_internalurl`
+
+  - |
+    Following variables were deprecated and removed in favor of their analogues
+
+      - `cinder_service_description` -> `cinder_service_v3_description`
+      - `cinder_service_publicuri_proto` -> `cinder_service_v3_publicuri_proto`
+      - `cinder_service_adminuri_proto` -> `cinder_service_v3_adminuri_proto`
+      - `cinder_service_internaluri_proto` -> `cinder_service_v3_internaluri_proto`
+      - `cinder_service_type` -> `cinder_service_v3_type`
+      - `cinder_service_publicuri` -> `cinder_service_v3_publicurl`
+      - `cinder_service_adminuri` -> `cinder_service_v3_adminurl`
+      - `cinder_service_internaluri` -> `cinder_service_v3_internalurl`
+      - `cinder_service_v3_port` -> `cinder_service_port`
+      - `cinder_service_v3_proto` -> `cinder_service_proto`

tasks/cinder_backends.yml

@@ -15,7 +15,7 @@
 
 - name: Ensure cinder api is available
   uri:
-    url: "{{ cinder_service_internaluri }}"
+    url: "{{ cinder_service_v3_internaluri }}"
     status_code: 200,300
     validate_certs: "{{ not keystone_service_internaluri_insecure | bool }}"
   register: api_status

vars/main.yml

@@ -113,18 +113,6 @@ cinder_core_files:
     mode: "0640"
 
 cinder_service_endpoints:
-  - service: "{{ cinder_service_v2_name }}"
-    interface: "public"
-    url: "{{ cinder_service_v2_publicurl }}"
-    state: "absent"
-  - service: "{{ cinder_service_v2_name }}"
-    interface: "internal"
-    url: "{{ cinder_service_v2_internalurl }}"
-    state: "absent"
-  - service: "{{ cinder_service_v2_name }}"
-    interface: "admin"
-    url: "{{ cinder_service_v2_adminurl }}"
-    state: "absent"
   - service: "{{ cinder_service_v3_name }}"
     interface: "public"
     url: "{{ cinder_service_v3_publicurl }}"
@@ -139,14 +127,6 @@ cinder_service_endpoints:
     state: present
 
 cinder_service_catalog:
-  - name: "{{ cinder_service_name }}"
-    type: "{{ cinder_service_type }}"
-    description: "{{ cinder_service_description }}"
-    state: absent
-  - name: "{{ cinder_service_v2_name }}"
-    type: "{{ cinder_service_v2_type }}"
-    description: "{{ cinder_service_v2_description }}"
-    state: "absent"
   - name: "{{ cinder_service_v3_name }}"
     type: "{{ cinder_service_v3_type }}"
     description: "{{ cinder_service_v3_description }}"