Change spec since v2 api is used as default

Since the cinder endpoint API version has been changed to v2 in
https://review.openstack.org/#/c/130738, the spec needs to be
adapted to this change accordingly.

This patch will break unit test unless the patch in
https://review.openstack.org/#/c/130738 is merged, because the API
version is changed in cookbook-openstack-common project.

I've run unit test in my local env successfully with these two
matched patches.

Change-Id: I28d182ff9e26fd31e5cd4f713dbffde3f04807dc
Closes-bug: #1385099
This commit is contained in:
Jun Hong Li
2014-10-28 15:58:36 +08:00
parent 5ebe4b2756
commit 801a2735cf

View File

@@ -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/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'
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'
)
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/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'
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'
)
end