openstack/puppet-horizon
Code Issues Proposed changes

Merge "Add simple_ip_management configuration option"

Browse Source
This commit is contained in:
Zuul 2018-07-12 02:06:38 +00:00 committed by Gerrit Code Review
commit cff8e8329f
4 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
manifests/init.pp
View File

@ -214,13 +214,13 @@
# Specify an absolute pathname.
# Defaults to /tmp
#
# [*policy_files_path*]
# (Optional) The path to the policy files
# Defaults to undef.
# [*policy_files_path*]
# (Optional) The path to the policy files
# Defaults to undef.
#
# [*policy_files*]
# (Optional) Policy files
# Defaults to undef.
# [*policy_files*]
# (Optional) Policy files
# Defaults to undef.
#
# [*secure_cookies*]
# (optional) Enables security settings for cookies. Useful when using
@ -316,22 +316,26 @@
# - { name: 'material', label: 'Material', path: 'themes/material' }
#
# [*default_theme*]
# (optional) The default theme to use from list of available themes. Value should be theme_name.
# (optional) The default theme to use from list of available themes. Value should be theme_name.
# Defaults to false
#
# [*simple_ip_management*]
# (optional) Boolean to enable or disable the simple_ip_management option to Horizon.
# Defaults to false
#
# [*password_autocomplete*]
# (optional) Whether to instruct the client browser to autofill the login form password
# Valid values are 'on' and 'off'
# Defaults to 'off'
# [*password_autocomplete*]
# (optional) Whether to instruct the client browser to autofill the login form password
# Valid values are 'on' and 'off'
# Defaults to 'off'
#
# [*images_panel*]
# (optional) Enabled panel for images.
# Valid values are 'legacy' and 'angular'
# Defaults to 'legacy'
# [*images_panel*]
# (optional) Enabled panel for images.
# Valid values are 'legacy' and 'angular'
# Defaults to 'legacy'
#
# [*create_image_defaults*]
# (optional) A dictionary of default settings for create image modal.
# Defaults to undef - will not add entry to local settings.
# [*create_image_defaults*]
# (optional) A dictionary of default settings for create image modal.
# Defaults to undef - will not add entry to local settings.
#
# [*password_retrieve*]
# (optional) Enables the use of 'Retrieve Password' in the Horizon Web UI.
@ -493,6 +497,7 @@ class horizon(
$vhost_extra_params = undef,
$available_themes = false,
$default_theme = false,
$simple_ip_management = false,
$password_autocomplete = 'off',
$images_panel = 'legacy',
$create_image_defaults = undef,

5
releasenotes/notes/add-simple-ip-mgmt-e8a1227a1a811a2d.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
New parameter horizon::simple_ip_manage can now be set to true to set and
enable simple_ip_management in the Horizon local_settings config.

2
spec/classes/horizon_init_spec.rb
View File

@ -128,6 +128,7 @@ describe 'horizon' do
{ 'name' => 'material', 'label' => 'Material', 'path' => 'themes/material' },
],
:default_theme => 'default',
:simple_ip_management => true,
:password_autocomplete => 'on',
:images_panel => 'angular',
:create_image_defaults => {'image_visibility' => 'private'},
@ -146,6 +147,7 @@ describe 'horizon' do
" 'identity': 2.0,",
"OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT = True",
"OPENSTACK_KEYSTONE_DEFAULT_DOMAIN = 'domain.tld'",
'HORIZON_CONFIG["simple_ip_management"] = True',
'HORIZON_CONFIG["password_autocomplete"] = "on"',
'HORIZON_CONFIG["images_panel"] = "angular"',
"SECRET_KEY = 'elj1IWiLoWHgcyYxFVLj7cM5rGOOxWl0'",

3
templates/local_settings.py.erb
View File

@ -163,6 +163,9 @@ HORIZON_CONFIG["password_validator"] = {
# Disable simplified floating IP address management for deployments with
# multiple floating IP pools or complex network requirements.
#HORIZON_CONFIG["simple_ip_management"] = False
<% if @simple_ip_management %>
HORIZON_CONFIG["simple_ip_management"] = True
<% end %>
# Turn off browser autocompletion for forms including the login form and
# the database creation workflow if so desired.