From a26c6fc37c20917f26905d7948487d17187782e5 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 6 Dec 2013 21:10:36 +1100 Subject: [PATCH] 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 1dd4297243d6ce25115828d87302a72e9d3e1f72) --- manifests/roles/admin.pp | 4 ++-- spec/classes/keystone_roles_admin_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/roles/admin.pp b/manifests/roles/admin.pp index 9af1f846e..eed03c74a 100644 --- a/manifests/roles/admin.pp +++ b/manifests/roles/admin.pp @@ -6,7 +6,7 @@ # * "admin" tenant (defaults to "openstack") # * admin user (that defaults to the "admin" tenant) # * admin role -# * Member role +# * _member_ role # * adds admin role to admin user on the "admin" tenant # # [*Parameters*] @@ -51,7 +51,7 @@ class keystone::roles::admin( email => $email, password => $password, } - keystone_role { ['admin', 'Member', '_member_']: + keystone_role { ['admin', '_member_']: ensure => present, } keystone_user_role { "${admin}@${admin_tenant}": diff --git a/spec/classes/keystone_roles_admin_spec.rb b/spec/classes/keystone_roles_admin_spec.rb index 5758d0c23..7605a450d 100644 --- a/spec/classes/keystone_roles_admin_spec.rb +++ b/spec/classes/keystone_roles_admin_spec.rb @@ -28,7 +28,7 @@ describe 'keystone::roles::admin' do :email => 'foo@bar', :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') } end it { should contain_keystone_user_role('admin@openstack').with(