From 6cbd72035bac19002ef566312a69595ed9b07695 Mon Sep 17 00:00:00 2001 From: Jun Hong Li Date: Mon, 3 Nov 2014 15:56:26 +0800 Subject: [PATCH] Change the specs for reverting cinder api to v1 Since there are many problems when applying cinder v2 api, like cannot attach volumes to VM from nova, and there may be other problems in glance, the integration of cinder v2 api and other services is not well tested and the related configurations are not clear. We'd better revert the cinder api version back to v1 before all things are clear. This patch may break cookbook-openstack-block-storage unless the patch https://review.openstack.org/#/c/132517/ is merged. Closes-bug: #1388741 Change-Id: I39cd138fe7cb6fe685df12403ff81aad8906d134 --- spec/identity_registration_spec.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/spec/identity_registration_spec.rb b/spec/identity_registration_spec.rb index 8c7829c..0e0884d 100644 --- a/spec/identity_registration_spec.rb +++ b/spec/identity_registration_spec.rb @@ -33,9 +33,9 @@ describe 'openstack-block-storage::identity_registration' do service_type: 'volume', service_description: 'Cinder Volume Service', endpoint_region: 'RegionOne', - endpoint_adminurl: 'http://127.0.0.1:8776/v2/%(tenant_id)s', - endpoint_internalurl: 'http://127.0.0.1:8776/v2/%(tenant_id)s', - endpoint_publicurl: 'http://127.0.0.1:8776/v2/%(tenant_id)s' + endpoint_adminurl: 'http://127.0.0.1:8776/v1/%(tenant_id)s', + endpoint_internalurl: 'http://127.0.0.1:8776/v1/%(tenant_id)s', + endpoint_publicurl: 'http://127.0.0.1:8776/v1/%(tenant_id)s' ) end @@ -50,9 +50,9 @@ describe 'openstack-block-storage::identity_registration' do service_type: 'volume', service_description: 'Cinder Volume Service', endpoint_region: 'RegionOne', - endpoint_adminurl: 'http://127.0.0.1:8776/v2/%(tenant_id)s', - endpoint_internalurl: 'http://127.0.0.1:8776/v2/%(tenant_id)s', - endpoint_publicurl: 'http://127.0.0.1:8776/v2/%(tenant_id)s' + endpoint_adminurl: 'http://127.0.0.1:8776/v1/%(tenant_id)s', + endpoint_internalurl: 'http://127.0.0.1:8776/v1/%(tenant_id)s', + endpoint_publicurl: 'http://127.0.0.1:8776/v1/%(tenant_id)s' ) end