Remove domain role from neutron 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 neutron 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 neutron user is to be created in the Default domain). Change-Id: I4b67565c9408c758acefc681dd756a1dca836ec3
This commit is contained in:
parent
7402658214
commit
c678df66d6
|
@ -86,6 +86,7 @@ end
|
|||
# Register Service User
|
||||
openstack_user service_user do
|
||||
project_name service_tenant_name
|
||||
domain_name service_domain_name
|
||||
password service_pass
|
||||
connection_params connection_params
|
||||
end
|
||||
|
@ -97,10 +98,3 @@ openstack_user service_user do
|
|||
connection_params connection_params
|
||||
action :grant_role
|
||||
end
|
||||
|
||||
openstack_user service_user do
|
||||
domain_name service_domain_name
|
||||
role_name service_role
|
||||
connection_params connection_params
|
||||
action :grant_domain
|
||||
end
|
||||
|
|
|
@ -67,22 +67,13 @@ describe 'openstack-network::identity_registration' do
|
|||
expect(chef_run).to create_openstack_user(
|
||||
service_user
|
||||
).with(
|
||||
domain_name: domain_name,
|
||||
project_name: project_name,
|
||||
password: password,
|
||||
connection_params: connection_params
|
||||
)
|
||||
end
|
||||
|
||||
it do
|
||||
expect(chef_run).to grant_domain_openstack_user(
|
||||
service_user
|
||||
).with(
|
||||
domain_name: domain_name,
|
||||
role_name: role_name,
|
||||
connection_params: connection_params
|
||||
)
|
||||
end
|
||||
|
||||
it do
|
||||
expect(chef_run).to grant_role_openstack_user(
|
||||
service_user
|
||||
|
|
Loading…
Reference in New Issue