Remove simple_ip_management

The simple_ip_management option was removed in Rocky [1]
so we remove it for Stein.

[1] https://docs.openstack.org/releasenotes/horizon/rocky.html

Change-Id: I8e16c0feef9fe51075d9a6e8a98188c52962a6eb
This commit is contained in:
Tobias Urdin 2018-09-24 11:33:10 +02:00
parent 148f02e7e0
commit 513dd2d2eb
4 changed files with 4 additions and 14 deletions

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,

View File

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

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'",

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"