summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorChristoph Albers <c.albers@x-ion.de>2016-02-12 18:55:33 +0100
committerChristoph Albers <c.albers@x-ion.de>2016-02-15 19:05:20 +0100
commit0d6cffad4eb92476df3fa75057f0f3e4c7708720 (patch)
treeeaeeb4317086b97a0312ed132830ff93e4329e28 /spec
parent4a7dc692b997a0ad3dcf8e012f6a25f8e042f4a3 (diff)
invert the order of endpoint and bind_service attributes
* endpoint type (admin, internal, public) and service (identitiy, network etc.) was switched during refactoring, this patch reverts this unintended switching * edited bind_service service type from public,internal,admin to 'all' for default binding to just one service Change-Id: I4d28b1b2489419c1f033dfcda0effa5a53c537c3 Depends-On: Iec485deaf415e4187a323435cce2b6bbadfc5d42 Depends-On: Ia5bddfc5e2fd77cd6e9e855c680b079f78fc1c3f Depends-On: I4f97b659361dabd7fac216305d2aad2f1bb98f51
Notes
Notes (review): Code-Review+2: Samuel Cassiba <sam@cassiba.com> Workflow+1: Mark Vanderwiel <vanderwl@us.ibm.com> Workflow+1: Jan Klare <j.klare@cloudbau.de> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 24 Feb 2016 12:03:44 +0000 Reviewed-on: https://review.openstack.org/279708 Project: openstack/cookbook-openstack-block-storage Branch: refs/heads/master
Diffstat (limited to 'spec')
-rw-r--r--spec/identity_registration_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/identity_registration_spec.rb b/spec/identity_registration_spec.rb
index 2901afd..35b79ea 100644
--- a/spec/identity_registration_spec.rb
+++ b/spec/identity_registration_spec.rb
@@ -61,9 +61,9 @@ describe 'openstack-block-storage::identity_registration' do
61 internal_url = 'http://internal.host:456/internal_path' 61 internal_url = 'http://internal.host:456/internal_path'
62 public_url = 'https://public.host:789/public_path' 62 public_url = 'https://public.host:789/public_path'
63 63
64 node.set['openstack']['endpoints']['block-storage']['internal']['uri'] = internal_url 64 node.set['openstack']['endpoints']['internal']['block-storage']['uri'] = internal_url
65 node.set['openstack']['endpoints']['block-storage']['admin']['uri'] = admin_url 65 node.set['openstack']['endpoints']['admin']['block-storage']['uri'] = admin_url
66 node.set['openstack']['endpoints']['block-storage']['public']['uri'] = public_url 66 node.set['openstack']['endpoints']['public']['block-storage']['uri'] = public_url
67 67
68 expect(chef_run).to create_endpoint_openstack_identity_register( 68 expect(chef_run).to create_endpoint_openstack_identity_register(
69 'Register Cinder V2 Volume Endpoint' 69 'Register Cinder V2 Volume Endpoint'