Merge "Remove cinder v2 API keystone service and endpoints"

deployment/cinder/cinder-api-container-puppet.yaml

@@ -143,19 +143,6 @@ outputs:
               roles:
                 - admin
                 - service
-        cinderv2:
-          endpoints:
-            public: {get_param: [EndpointMap, CinderV2Public, uri]}
-            internal: {get_param: [EndpointMap, CinderV2Internal, uri]}
-            admin: {get_param: [EndpointMap, CinderV2Admin, uri]}
-          users:
-            cinderv2:
-              password: {get_param: CinderPassword}
-              roles:
-                - admin
-                - service
-          region: {get_param: KeystoneRegion}
-          service: 'volumev2'
         cinderv3:
           endpoints:
             public: {get_param: [EndpointMap, CinderV3Public, uri]}
@@ -419,9 +406,17 @@ outputs:
           become: true
           os_keystone_service:
             cloud: {get_param: RootStackName}
-            name: cinderv3
-            service_type: volume
+            name: "{{ item.service_name }}"
+            service_type: "{{ item.service_type }}"
             state: absent
+          loop:
+            - {service_name: cinderv2, service_type: volumev2}
+            # The following cinderv3/volume entry removes a legacy workaround
+            # unrelated to cinder's v3 API service (cinderv3/volumev3). See
+            # Ic0eb72f78e2a19e2f40ab12631a872d828bab46a for details.
+            - {service_name: cinderv3, service_type: volume}
+          loop_control:
+            index_var: cinder_api_service
           when:
             - step|int == 4
         - name: Manage Cinder Volume Type