openstack
/
puppet-horizon
Code Issues Proposed changes

Merge "Support the SYSTEM_SCOPE_SERVICES parameter"

This commit is contained in:
Zuul 2022-05-11 10:54:04 +00:00 committed by Gerrit Code Review
parent 6236f39018 3f6b4b33a4
commit 6ede730232
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/init.pp
View File

@ -531,6 +531,10 @@
# "snapshot", "volume" and "volume_snapshot".
# Defaults to undef
#
# [*system_scope_services*]
# (optional) Enable the use of the system scope token on per-service basis.
# Defaults to undef
#
# DEPRECATED PARAMETERS
#
# [*enable_user_pass*]
@ -646,6 +650,7 @@ class horizon(
$customization_module = undef,
$horizon_upload_mode = undef,
$default_boot_source = undef,
$system_scope_services = undef,
# DEPRECATED PARAMETERS
$enable_user_pass = undef,
) inherits horizon::params {

4
releasenotes/notes/system_scope_services-5e19b53fc2b8b48c.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- |
The new ``horizon::system_scope_services`` parameter has been added.

11
templates/local_settings.py.erb
View File

@ -1042,3 +1042,14 @@ HORIZON_IMAGES_UPLOAD_MODE = "<%= @horizon_upload_mode_real %>"
<% if @default_boot_source -%>
DEFAULT_BOOT_SOURCE = "<%= @default_boot_source %>"
<%- end -%>
# Services may require a System Scope token for certain operations. This
# settings enables the use of the system scope token on per-service basis.
#SYSTEM_SCOPE_SERVICES = []
<% if ! @system_scope_services.nil? -%>
<% if @system_scope_services.kind_of?(Array) -%>
SYSTEM_SCOPE_SERVICES = ['<%= @system_scope_services.join("', '") %>']
<%- else -%>
SYSTEM_SCOPE_SERVICES = ['<%= @system_scope_services %>']
<%- end -%>
<%- end -%>