diff --git a/manifests/init.pp b/manifests/init.pp index 348d37cf..0d9e91e2 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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, diff --git a/releasenotes/notes/remove-sim-50f5d779a67d489d.yaml b/releasenotes/notes/remove-sim-50f5d779a67d489d.yaml new file mode 100644 index 00000000..659ea3b6 --- /dev/null +++ b/releasenotes/notes/remove-sim-50f5d779a67d489d.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + The horizon::simple_ip_management parameter has been removed. diff --git a/spec/classes/horizon_init_spec.rb b/spec/classes/horizon_init_spec.rb index 60373868..cc0ef78e 100644 --- a/spec/classes/horizon_init_spec.rb +++ b/spec/classes/horizon_init_spec.rb @@ -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'", diff --git a/templates/local_settings.py.erb b/templates/local_settings.py.erb index 409905d6..17b425ea 100644 --- a/templates/local_settings.py.erb +++ b/templates/local_settings.py.erb @@ -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"