diff --git a/manifests/init.pp b/manifests/init.pp index 3ca7331f..688c2d94 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -186,23 +186,6 @@ # (optional) Selects the session engine for Django to use. # Defaults to undef - will not add entry to local settings. # -# [*tuskar_ui*] -# (optional) Boolean to enable Tuskar-UI related configuration (http://tuskar-ui.readthedocs.org/) -# Defaults to false -# -# [*tuskar_ui_ironic_discoverd_url*] -# (optional) Tuskar-UI - Ironic Discoverd API endpoint -# Defaults to 'http://127.0.0.1:5050' -# -# [*tuskar_ui_undercloud_admin_password*] -# (optional) Tuskar-UI - Undercloud admin password used to authenticate admin user in Tuskar-UI. -# It is required by Heat to perform certain actions. -# Defaults to undef -# -# [*tuskar_ui_deployment_mode*] -# (optional) Tuskar-UI - Deployment mode ('poc' or 'scale') -# Defaults to 'scale' -# # [*redirect_type*] # (optional) What type of redirect to use when redirecting an http request # for a user. This should be either 'temp' or 'permanent'. Setting this value @@ -286,6 +269,23 @@ # (optional) The directory location for the theme (e.g., "static/themes/blue") # Default to undef # +# [*tuskar_ui*] +# (optional) Boolean to enable Tuskar-UI related configuration (http://tuskar-ui.readthedocs# +# Defaults to undef +# +# [*tuskar_ui_ironic_discoverd_url*] +# (optional) Tuskar-UI - Ironic Discoverd API endpoint +# Defaults to undef +# +# [*tuskar_ui_undercloud_admin_password*] +# (optional) Tuskar-UI - Undercloud admin password used to authenticate admin user in Tuskar# +# It is required by Heat to perform certain actions. +# Defaults to undef +# +# [*tuskar_ui_deployment_mode*] +# (optional) Tuskar-UI - Deployment mode ('poc' or 'scale') +# Defaults to undef +# # === Examples # # class { 'horizon': @@ -334,10 +334,6 @@ class horizon( $file_upload_temp_dir = '/tmp', $policy_files_path = undef, $policy_files = undef, - $tuskar_ui = false, - $tuskar_ui_ironic_discoverd_url = 'http://127.0.0.1:5050', - $tuskar_ui_undercloud_admin_password = undef, - $tuskar_ui_deployment_mode = 'scale', $redirect_type = 'permanent', $api_versions = {'identity' => '3'}, $keystone_multidomain_support = false, @@ -355,6 +351,10 @@ class horizon( # DEPRECATED PARAMETERS $custom_theme_path = undef, $fqdn = undef, + $tuskar_ui = undef, + $tuskar_ui_ironic_discoverd_url = unedf, + $tuskar_ui_undercloud_admin_password = undef, + $tuskar_ui_deployment_mode = undef, ) inherits ::horizon::params { $hypervisor_defaults = { @@ -375,6 +375,10 @@ class horizon( warning('custom_theme_path has been deprecated in mitaka and will be removed in a future release.') } + if $tuskar_ui or $tuskar_ui_ironic_discoverd_url or $tuskar_ui_undercloud_admin_password or $tuskar_ui_deployment_mode { + warning('tuskar module is no longer maintained, all tuskar parameters will be removed after Newton cycle.') + } + # Default options for the OPENSTACK_CINDER_FEATURES section. These will # be merged with user-provided options when the local_settings.py.erb # template is interpolated. @@ -463,8 +467,4 @@ class horizon( } } - $tuskar_ui_deployment_mode_allowed_values = ['scale', 'poc'] - if ! (member($tuskar_ui_deployment_mode_allowed_values, $tuskar_ui_deployment_mode)) { - fail("'${$tuskar_ui_deployment_mode}' is not correct value for tuskar_ui_deployment_mode parameter. It must be either 'scale' or 'poc'.") - } } diff --git a/releasenotes/notes/tuskar-9fa7bbe0df150fd1.yaml b/releasenotes/notes/tuskar-9fa7bbe0df150fd1.yaml new file mode 100644 index 00000000..e97452f8 --- /dev/null +++ b/releasenotes/notes/tuskar-9fa7bbe0df150fd1.yaml @@ -0,0 +1,3 @@ +--- +deprecations: + - deprecate all tuskar parameters since the project is no longer maintained. diff --git a/spec/classes/horizon_init_spec.rb b/spec/classes/horizon_init_spec.rb index 196d7ec7..165270c8 100644 --- a/spec/classes/horizon_init_spec.rb +++ b/spec/classes/horizon_init_spec.rb @@ -210,34 +210,6 @@ describe 'horizon' do } end - context 'with tuskar-ui enabled' do - before do - params.merge!({ - :tuskar_ui => true, - :tuskar_ui_ironic_discoverd_url => 'http://127.0.0.1:5050', - :tuskar_ui_undercloud_admin_password => 'somesecretpassword', - :tuskar_ui_deployment_mode => 'scale', - }) - end - - it 'generates local_settings.py' do - verify_concat_fragment_contents(catalogue, 'local_settings.py', [ - 'IRONIC_DISCOVERD_URL = "http://127.0.0.1:5050"', - 'UNDERCLOUD_ADMIN_PASSWORD = "somesecretpassword"', - 'DEPLOYMENT_MODE = "scale"', - ]) - end - end - - context 'with wrong tuskar_ui_deployment_mode parameter value' do - before do - params.merge!({ - :tuskar_ui_deployment_mode => 'wrong' }) - end - it_raises 'a Puppet::Error', /'wrong' is not correct value for tuskar_ui_deployment_mode parameter. It must be either 'scale' or 'poc'./ - end - - context 'with vhost_extra_params' do before do params.merge!({ diff --git a/templates/local_settings.py.erb b/templates/local_settings.py.erb index a7d4c3db..a8c6567c 100644 --- a/templates/local_settings.py.erb +++ b/templates/local_settings.py.erb @@ -864,12 +864,6 @@ COMPRESS_OFFLINE = <%= @compress_offline.to_s.capitalize %> # stored until they are loaded into Glance. FILE_UPLOAD_TEMP_DIR = '<%= @file_upload_temp_dir %>' -<% if @tuskar_ui %> -IRONIC_DISCOVERD_URL = "<%= @tuskar_ui_ironic_discoverd_url %>" -UNDERCLOUD_ADMIN_PASSWORD = "<%= @tuskar_ui_undercloud_admin_password %>" -DEPLOYMENT_MODE = "<%= @tuskar_ui_deployment_mode %>" -<% end %> - # The default date range in the Overview panel meters - either minus N # days (if the value is integer N), or from the beginning of the current month # until today (if set to None). This setting should be used to limit the amount