Set Horizon default role to _member_

Keystone puppet module creates "Member" and "_member_" roles, which
creates confusion as to why both exist.  In a parallel change [1] we
modify keystone to only create the _member_ role.  Here we switch
Horizon to use that as the default role.

See also rhbz#984294 [2]

[1] https://review.openstack.org/#/c/60463/
[2] https://bugzilla.redhat.com/show_bug.cgi?id=984294

Change-Id: I329db398d0ec33eb3997167806717c45df7cec09
This commit is contained in:
Ian Wienand 2013-12-06 21:06:51 +11:00
parent 8840838298
commit cd25ea33a7
2 changed files with 4 additions and 4 deletions

View File

@ -44,7 +44,7 @@
#
# [*keystone_default_role*]
# (Optional) Default role for keystone authentication.
# Defaults to 'Member'.
# Defaults to '_member_'.
#
# [*django_debug*]
# (Optional) Sets Django debug level.
@ -70,7 +70,7 @@ class openstack::horizon (
$horizon_app_links = undef,
$keystone_host = '127.0.0.1',
$keystone_scheme = 'http',
$keystone_default_role = 'Member',
$keystone_default_role = '_member_',
$django_debug = 'False',
$api_result_limit = 1000
) {

View File

@ -33,7 +33,7 @@ describe 'openstack::horizon' do
:horizon_app_links => false,
:keystone_host => '127.0.0.1',
:keystone_scheme => 'http',
:keystone_default_role => 'Member',
:keystone_default_role => '_member_',
:django_debug => 'False',
:api_result_limit => 1000
)
@ -54,7 +54,7 @@ describe 'openstack::horizon' do
:horizon_app_links => false,
:keystone_host => '127.0.0.1',
:keystone_scheme => 'http',
:keystone_default_role => 'Member',
:keystone_default_role => '_member_',
:django_debug => 'False',
:api_result_limit => 1000
)