Cinder: Use correct service names for api versions

This PS updates cinder to use the correct service names for API
versions

V2:
 * https://github.com/openstack-dev/devstack/blob/stable/newton/lib/cinder#L387
 * https://github.com/openstack-dev/devstack/blob/master/lib/cinder#L381

V3:
 * https://github.com/openstack-dev/devstack/blob/stable/newton/lib/cinder#L395
 * https://github.com/openstack-dev/devstack/blob/master/lib/cinder#L387

The custom value for Nova's cinder catalog_info is also removed, as this was
required to use the incorrect service catalog names.

Change-Id: Ic88826a3c8233e260caca69272cf32021825b48c

cinder/values.yaml

@@ -1033,7 +1033,7 @@ endpoints:
         default: 8776
         public: 80
   volumev2:
-    name: cinder
+    name: cinderv2
     hosts:
       default: cinder-api
       public: cinder
@@ -1048,7 +1048,7 @@ endpoints:
         default: 8776
         public: 80
   volumev3:
-    name: cinder
+    name: cinderv3
     hosts:
       default: cinder-api
       public: cinder

nova/values.yaml

@@ -1062,8 +1062,6 @@ conf:
       enable_proxy_headers_parsing: true
     glance:
       num_retries: 3
-    cinder:
-      catalog_info: volumev2:cinder:internalURL
     ironic:
       api_endpoint: null
       auth_url: null