openstack/puppet-horizon
Code Issues Proposed changes

Merge "Remove simple_ip_management"

Browse Source
This commit is contained in:
Zuul 2018-10-05 01:20:24 +00:00 committed by Gerrit Code Review
commit 9a56441457
4 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/init.pp
View File

@ -335,10 +335,6 @@
# (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'
@ -517,7 +513,6 @@ 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,

4
releasenotes/notes/remove-sim-50f5d779a67d489d.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- |
The horizon::simple_ip_management parameter has been removed.

2
spec/classes/horizon_init_spec.rb
View File

@ -132,7 +132,6 @@ 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'},
@ -151,7 +150,6 @@ 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'",

7
templates/local_settings.py.erb
View File

@ -160,13 +160,6 @@ HORIZON_CONFIG["password_validator"] = {
}
<% end %>
# 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.
#HORIZON_CONFIG["password_autocomplete"] = "off"