20abcad4d5
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