From cd25ea33a746725fff83ccb9d0d331fa430db382 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 6 Dec 2013 21:06:51 +1100 Subject: [PATCH] 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 --- manifests/horizon.pp | 4 ++-- spec/classes/openstack_horizon_spec.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/horizon.pp b/manifests/horizon.pp index 39eba7c..afb5368 100644 --- a/manifests/horizon.pp +++ b/manifests/horizon.pp @@ -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 ) { diff --git a/spec/classes/openstack_horizon_spec.rb b/spec/classes/openstack_horizon_spec.rb index d9e2723..4e53458 100644 --- a/spec/classes/openstack_horizon_spec.rb +++ b/spec/classes/openstack_horizon_spec.rb @@ -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 )