Don't create Member role
Creating the "_member_" role and "Member" role creates confusion.
"_member_" has special significance to keystone, so we keep that.
Horizon is modified to use "_member_" as the default role in [1].
This change should be merged after that.
See also rhbz#984294 [2]
[1] https://review.openstack.org/#/c/60462/
[2] https://bugzilla.redhat.com/show_bug.cgi?id=984294
Change-Id: If4ed1c2c72ca67acad7b70651e68ff7ce68157dd
(cherry picked from commit 1dd4297243
)
This commit is contained in:
parent
15c91563c7
commit
a26c6fc37c
|
@ -6,7 +6,7 @@
|
||||||
# * "admin" tenant (defaults to "openstack")
|
# * "admin" tenant (defaults to "openstack")
|
||||||
# * admin user (that defaults to the "admin" tenant)
|
# * admin user (that defaults to the "admin" tenant)
|
||||||
# * admin role
|
# * admin role
|
||||||
# * Member role
|
# * _member_ role
|
||||||
# * adds admin role to admin user on the "admin" tenant
|
# * adds admin role to admin user on the "admin" tenant
|
||||||
#
|
#
|
||||||
# [*Parameters*]
|
# [*Parameters*]
|
||||||
|
@ -51,7 +51,7 @@ class keystone::roles::admin(
|
||||||
email => $email,
|
email => $email,
|
||||||
password => $password,
|
password => $password,
|
||||||
}
|
}
|
||||||
keystone_role { ['admin', 'Member', '_member_']:
|
keystone_role { ['admin', '_member_']:
|
||||||
ensure => present,
|
ensure => present,
|
||||||
}
|
}
|
||||||
keystone_user_role { "${admin}@${admin_tenant}":
|
keystone_user_role { "${admin}@${admin_tenant}":
|
||||||
|
|
|
@ -28,7 +28,7 @@ describe 'keystone::roles::admin' do
|
||||||
:email => 'foo@bar',
|
:email => 'foo@bar',
|
||||||
:password => 'ChangeMe'
|
:password => 'ChangeMe'
|
||||||
)}
|
)}
|
||||||
['admin', 'Member', '_member_'].each do |role_name|
|
['admin', '_member_'].each do |role_name|
|
||||||
it { should contain_keystone_role(role_name).with_ensure('present') }
|
it { should contain_keystone_role(role_name).with_ensure('present') }
|
||||||
end
|
end
|
||||||
it { should contain_keystone_user_role('admin@openstack').with(
|
it { should contain_keystone_user_role('admin@openstack').with(
|
||||||
|
|
Loading…
Reference in New Issue