Add simple_ip_management configuration option
Change-Id: I387479f34c6e059e136a26958d9ecf5a10a666b1
This commit is contained in:
parent
53be1db825
commit
8a88f3c995
|
@ -214,13 +214,13 @@
|
||||||
# Specify an absolute pathname.
|
# Specify an absolute pathname.
|
||||||
# Defaults to /tmp
|
# Defaults to /tmp
|
||||||
#
|
#
|
||||||
# [*policy_files_path*]
|
# [*policy_files_path*]
|
||||||
# (Optional) The path to the policy files
|
# (Optional) The path to the policy files
|
||||||
# Defaults to undef.
|
# Defaults to undef.
|
||||||
#
|
#
|
||||||
# [*policy_files*]
|
# [*policy_files*]
|
||||||
# (Optional) Policy files
|
# (Optional) Policy files
|
||||||
# Defaults to undef.
|
# Defaults to undef.
|
||||||
#
|
#
|
||||||
# [*secure_cookies*]
|
# [*secure_cookies*]
|
||||||
# (optional) Enables security settings for cookies. Useful when using
|
# (optional) Enables security settings for cookies. Useful when using
|
||||||
|
@ -307,22 +307,26 @@
|
||||||
# - { name: 'material', label: 'Material', path: 'themes/material' }
|
# - { name: 'material', label: 'Material', path: 'themes/material' }
|
||||||
#
|
#
|
||||||
# [*default_theme*]
|
# [*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
|
# Defaults to false
|
||||||
#
|
#
|
||||||
# [*password_autocomplete*]
|
# [*password_autocomplete*]
|
||||||
# (optional) Whether to instruct the client browser to autofill the login form password
|
# (optional) Whether to instruct the client browser to autofill the login form password
|
||||||
# Valid values are 'on' and 'off'
|
# Valid values are 'on' and 'off'
|
||||||
# Defaults to 'off'
|
# Defaults to 'off'
|
||||||
#
|
#
|
||||||
# [*images_panel*]
|
# [*images_panel*]
|
||||||
# (optional) Enabled panel for images.
|
# (optional) Enabled panel for images.
|
||||||
# Valid values are 'legacy' and 'angular'
|
# Valid values are 'legacy' and 'angular'
|
||||||
# Defaults to 'legacy'
|
# Defaults to 'legacy'
|
||||||
#
|
#
|
||||||
# [*create_image_defaults*]
|
# [*create_image_defaults*]
|
||||||
# (optional) A dictionary of default settings for create image modal.
|
# (optional) A dictionary of default settings for create image modal.
|
||||||
# Defaults to undef - will not add entry to local settings.
|
# Defaults to undef - will not add entry to local settings.
|
||||||
#
|
#
|
||||||
# [*password_retrieve*]
|
# [*password_retrieve*]
|
||||||
# (optional) Enables the use of 'Retrieve Password' in the Horizon Web UI.
|
# (optional) Enables the use of 'Retrieve Password' in the Horizon Web UI.
|
||||||
|
@ -483,6 +487,7 @@ class horizon(
|
||||||
$vhost_extra_params = undef,
|
$vhost_extra_params = undef,
|
||||||
$available_themes = false,
|
$available_themes = false,
|
||||||
$default_theme = false,
|
$default_theme = false,
|
||||||
|
$simple_ip_management = false,
|
||||||
$password_autocomplete = 'off',
|
$password_autocomplete = 'off',
|
||||||
$images_panel = 'legacy',
|
$images_panel = 'legacy',
|
||||||
$create_image_defaults = undef,
|
$create_image_defaults = undef,
|
||||||
|
|
|
@ -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.
|
|
@ -128,6 +128,7 @@ describe 'horizon' do
|
||||||
{ 'name' => 'material', 'label' => 'Material', 'path' => 'themes/material' },
|
{ 'name' => 'material', 'label' => 'Material', 'path' => 'themes/material' },
|
||||||
],
|
],
|
||||||
:default_theme => 'default',
|
:default_theme => 'default',
|
||||||
|
:simple_ip_management => true,
|
||||||
:password_autocomplete => 'on',
|
:password_autocomplete => 'on',
|
||||||
:images_panel => 'angular',
|
:images_panel => 'angular',
|
||||||
:create_image_defaults => {'image_visibility' => 'private'},
|
:create_image_defaults => {'image_visibility' => 'private'},
|
||||||
|
@ -146,6 +147,7 @@ describe 'horizon' do
|
||||||
" 'identity': 2.0,",
|
" 'identity': 2.0,",
|
||||||
"OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT = True",
|
"OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT = True",
|
||||||
"OPENSTACK_KEYSTONE_DEFAULT_DOMAIN = 'domain.tld'",
|
"OPENSTACK_KEYSTONE_DEFAULT_DOMAIN = 'domain.tld'",
|
||||||
|
'HORIZON_CONFIG["simple_ip_management"] = True',
|
||||||
'HORIZON_CONFIG["password_autocomplete"] = "on"',
|
'HORIZON_CONFIG["password_autocomplete"] = "on"',
|
||||||
'HORIZON_CONFIG["images_panel"] = "angular"',
|
'HORIZON_CONFIG["images_panel"] = "angular"',
|
||||||
"SECRET_KEY = 'elj1IWiLoWHgcyYxFVLj7cM5rGOOxWl0'",
|
"SECRET_KEY = 'elj1IWiLoWHgcyYxFVLj7cM5rGOOxWl0'",
|
||||||
|
|
|
@ -154,6 +154,9 @@ HORIZON_CONFIG["password_validator"] = {
|
||||||
# Disable simplified floating IP address management for deployments with
|
# Disable simplified floating IP address management for deployments with
|
||||||
# multiple floating IP pools or complex network requirements.
|
# multiple floating IP pools or complex network requirements.
|
||||||
#HORIZON_CONFIG["simple_ip_management"] = False
|
#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
|
# Turn off browser autocompletion for forms including the login form and
|
||||||
# the database creation workflow if so desired.
|
# the database creation workflow if so desired.
|
||||||
|
|
Loading…
Reference in New Issue