Revert "Drop cinderv1 endpoints"
Need to fix tempest first
This reverts commit f4a06c21fffe8fb5fc090899beb42a250c7c5e45.
Change-Id: Ia1b1dc4e2091b9028f278d22621050500fdd67ea
diff --git a/keystone/client/service/cinder.yml b/keystone/client/service/cinder.yml
index 485b95e..958fae1 100644
--- a/keystone/client/service/cinder.yml
+++ b/keystone/client/service/cinder.yml
@@ -15,3 +15,21 @@
is_admin: true
password: ${_param:keystone_cinder_password}
email: ${_param:admin_email}
+ service:
+ cinder:
+ type: volume
+ description: OpenStack Volume Service
+ endpoints:
+ - region: ${_param:openstack_region}
+ public_address: ${_param:cluster_public_host}
+ public_protocol: ${_param:cluster_public_protocol}
+ public_port: 8776
+ public_path: '/v1/$(project_id)s'
+ internal_address: ${_param:cinder_service_host}
+ internal_port: 8776
+ internal_path: '/v1/$(project_id)s'
+ internal_protocol: ${_param:cinder_service_protocol}
+ admin_protocol: ${_param:cinder_service_protocol}
+ admin_address: ${_param:cinder_service_host}
+ admin_port: 8776
+ admin_path: '/v1/$(project_id)s'
diff --git a/keystone/client/v3/service/cinder.yml b/keystone/client/v3/service/cinder.yml
index 30a159f..bfb0e70 100644
--- a/keystone/client/v3/service/cinder.yml
+++ b/keystone/client/v3/service/cinder.yml
@@ -14,3 +14,20 @@
service_admin:
name: admin
project_id: service
+ services:
+ cinder:
+ type: volume
+ description: OpenStack Volume Service
+ endpoints:
+ cinder_public_v1:
+ interface: 'public'
+ url: ${_param:cluster_public_protocol}://${_param:cluster_public_host}:8776/v1/$(project_id)s
+ region: ${_param:openstack_region}
+ cinder_internal_v1:
+ interface: 'internal'
+ url: ${_param:cinder_service_protocol}://${_param:cinder_service_host}:8776/v1/$(project_id)s
+ region: ${_param:openstack_region}
+ cinder_admin_v1:
+ interface: 'admin'
+ url: ${_param:cinder_service_protocol}://${_param:cinder_service_host}:8776/v1/$(project_id)s
+ region: ${_param:openstack_region}