openstack
/
puppet-horizon
Code Issues Proposed changes

Change default member role to member 

A (long) time ago keystone-bootstrap changed the
default member role that is created to member from
the legacy _member_ role.

This changes the default value in horizon to conform
with what is the actual default when bootstrapping
keystone.

Deployments that might still be using _member_ should
set this explicitly.

Change-Id: I8c18b585c71817ec7c5450c425e2ec7bc9a83f18
This commit is contained in:
Tobias Urdin 2018-11-20 20:39:24 +01:00
parent 12e338f4a8
commit 9db6f8cc09
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/init.pp
View File

@ -62,7 +62,7 @@
# (optional) Full url of keystone public endpoint. (Defaults to 'http://127.0.0.1:5000')
#
# [*keystone_default_role*]
# (optional) Default Keystone role for new users. Defaults to '_member_'.
# (optional) Default Keystone role for new users. Defaults to 'member'.
#
# [*django_debug*]
# (optional) Enable or disable Django debugging. Defaults to 'False'.
@ -466,7 +466,7 @@ class horizon(
$manage_memcache_package = true,
$horizon_app_links = false,
$keystone_url = 'http://127.0.0.1:5000',
$keystone_default_role = '_member_',
$keystone_default_role = 'member',
$django_debug = 'False',
$site_branding = undef,
$openstack_endpoint_type = undef,

12
releasenotes/notes/change-keystone-default-role-fe630805edb631f4.yaml Normal file
View File

@ -0,0 +1,12 @@
features:
- |
The default keystone role horizon::keystone_default_role is changed from
_member_ to member to conform with what keystone-bootstrap creates.
This sets the OPENSTACK_KEYSTONE_DEFAULT_ROLE configuration option in
local_settings.
upgrade:
- |
The default keystone role horizon::keystone_default_role is changed from
_member_ to member. This sets the OPENSTACK_KEYSTONE_DEFAULT_ROLE config
option in local_settings, if you still require or use the _member_ role
as default you need to set this explicitly.

2
spec/classes/horizon_init_spec.rb
View File

@ -64,7 +64,7 @@ describe 'horizon' do
'HORIZON_CONFIG["images_panel"] = "legacy"',
"SECRET_KEY = 'elj1IWiLoWHgcyYxFVLj7cM5rGOOxWl0'",
'OPENSTACK_KEYSTONE_URL = "http://127.0.0.1:5000"',
'OPENSTACK_KEYSTONE_DEFAULT_ROLE = "_member_"',
'OPENSTACK_KEYSTONE_DEFAULT_ROLE = "member"',
" 'can_set_mount_point': True,",
" 'can_set_password': False,",
" 'enable_distributed_router': False,",

2
templates/local_settings.py.erb
View File

@ -270,7 +270,7 @@ AVAILABLE_REGIONS = [
#OPENSTACK_HOST = "127.0.0.1"
#OPENSTACK_KEYSTONE_URL = "http://%s:5000/v2.0" % OPENSTACK_HOST
#OPENSTACK_KEYSTONE_DEFAULT_ROLE = "_member_"
#OPENSTACK_KEYSTONE_DEFAULT_ROLE = "member"
OPENSTACK_KEYSTONE_URL = "<%= @keystone_url %>"
OPENSTACK_KEYSTONE_DEFAULT_ROLE = "<%= @keystone_default_role %>"