summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorRoger Luethi <rl@patchworkscience.org>2017-11-09 12:07:47 +0100
committerRoger Luethi <rl@patchworkscience.org>2017-11-13 15:09:07 +0000
commit54f8d6d9174540debd0659abc2bbe782379f65f4 (patch)
tree147f998fabb1cea2b5dcf87010305254feb2ae16 /spec
parente5e8bb9326fb808ac8d3e20d615a71cd959bf49d (diff)
Remove domain role from cinder service user
This patch removes the openstack_user resource with :grant_domain action. A user is always created within a specific domain; such a membership cannot be tacked on later. This resource gave the user the role intended for their project for the domain (i.e., for the Default domain instead of for the service project). We add the domain_name attribute that creates the cinder user in the desired domain. Note that this change needs a sufficiently recent openstackclient cookbook -- otherwise the domain_name attribute is ignored (which does not matter as long as the cinder user is to be created in the Default domain). Change-Id: I3d3cad8f870f80b577ded04588c401c27c62fbc8
Notes
Notes (review): Code-Review+2: Christoph Albers <c.albers@x-ion.de> Code-Review+2: Samuel Cassiba <s@cassiba.com> Workflow+1: Samuel Cassiba <s@cassiba.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 17 Nov 2017 20:22:41 +0000 Reviewed-on: https://review.openstack.org/519377 Project: openstack/cookbook-openstack-block-storage Branch: refs/heads/master
Diffstat (limited to 'spec')
-rw-r--r--spec/identity_registration_spec.rb11
1 files changed, 1 insertions, 10 deletions
diff --git a/spec/identity_registration_spec.rb b/spec/identity_registration_spec.rb
index e839d1b..95e2315 100644
--- a/spec/identity_registration_spec.rb
+++ b/spec/identity_registration_spec.rb
@@ -73,6 +73,7 @@ describe 'openstack-block-storage::identity_registration' do
73 expect(chef_run).to create_openstack_user( 73 expect(chef_run).to create_openstack_user(
74 service_user 74 service_user
75 ).with( 75 ).with(
76 domain_name: domain_name,
76 project_name: project_name, 77 project_name: project_name,
77 password: password, 78 password: password,
78 connection_params: connection_params 79 connection_params: connection_params
@@ -80,16 +81,6 @@ describe 'openstack-block-storage::identity_registration' do
80 end 81 end
81 82
82 it do 83 it do
83 expect(chef_run).to grant_domain_openstack_user(
84 service_user
85 ).with(
86 domain_name: domain_name,
87 role_name: role_name,
88 connection_params: connection_params
89 )
90 end
91
92 it do
93 expect(chef_run).to grant_role_openstack_user( 84 expect(chef_run).to grant_role_openstack_user(
94 service_user 85 service_user
95 ).with( 86 ).with(