From 57905ff386f93dd4f6b80deb312c3bfbc605e707 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 4 Aug 2022 00:52:03 +0900 Subject: [PATCH] Drop default_dashboard default_dashboard was deprecated a long ago in Horizon[1] and Having that parameter in local_settings triggers the following warning message. ``` WARNING:root:"dashboards" and "default_dashboard" in (local_)settings is DEPRECATED now and may be unsupported in some future release. The preferred way to specify the order of dashboards and the default dashboard is the pluggable dashboard mechanism (in ...). ``` This change removes that parameter hard-coded in the template file to get rid of the warning message. Currently the project dashboard is shown first in Horizon by default so removing the parameter does not cause any change in behavior. This also removes these deprecated parameters from the template file used in unit tests. [1] 75bc2e6aa86d31f60288021694699302b3873af3 Closes-Bug: #1983390 Change-Id: I8cd5346a553db9ba9f6bdf8ffdd9e7d89d16c4be --- spec/classes/horizon_init_spec.rb | 6 ------ spec/fixtures/override_local_settings.py.erb | 2 -- templates/local_settings.py.erb | 1 - 3 files changed, 9 deletions(-) diff --git a/spec/classes/horizon_init_spec.rb b/spec/classes/horizon_init_spec.rb index b46ebd73..249878a3 100644 --- a/spec/classes/horizon_init_spec.rb +++ b/spec/classes/horizon_init_spec.rb @@ -472,8 +472,6 @@ describe 'horizon' do '# Custom local_settings.py', 'DEBUG = True', "HORIZON_CONFIG = {", - " 'dashboards': ('project', 'admin', 'settings',),", - " 'default_dashboard': 'project',", " 'user_home': 'openstack_dashboard.views.get_user_home',", " 'ajax_queue_limit': 10,", " 'auto_fade_alerts': {", @@ -656,8 +654,6 @@ describe 'horizon' do verify_concat_fragment_contents(catalogue, 'local_settings.py', [ '# Custom local_settings.py', "HORIZON_CONFIG = {", - " 'dashboards': ('project', 'admin', 'settings',),", - " 'default_dashboard': 'project',", " 'user_home': 'openstack_dashboard.views.get_user_home',", " 'ajax_queue_limit': 10,", " 'auto_fade_alerts': {", @@ -688,8 +684,6 @@ describe 'horizon' do verify_concat_fragment_contents(catalogue, 'local_settings.py', [ '# Custom local_settings.py', "HORIZON_CONFIG = {", - " 'dashboards': ('project', 'admin', 'settings',),", - " 'default_dashboard': 'project',", " 'user_home': 'openstack_dashboard.views.get_user_home',", " 'ajax_queue_limit': 10,", " 'auto_fade_alerts': {", diff --git a/spec/fixtures/override_local_settings.py.erb b/spec/fixtures/override_local_settings.py.erb index 1fb85c53..f2900ce8 100644 --- a/spec/fixtures/override_local_settings.py.erb +++ b/spec/fixtures/override_local_settings.py.erb @@ -2,8 +2,6 @@ DEBUG = <%= @django_debug %> HORIZON_CONFIG = { - 'dashboards': ('project', 'admin', 'settings',), - 'default_dashboard': 'project', 'user_home': 'openstack_dashboard.views.get_user_home', 'ajax_queue_limit': 10, 'auto_fade_alerts': { diff --git a/templates/local_settings.py.erb b/templates/local_settings.py.erb index 3aaf140c..34ad0588 100644 --- a/templates/local_settings.py.erb +++ b/templates/local_settings.py.erb @@ -129,7 +129,6 @@ OPENSTACK_KEYSTONE_DEFAULT_DOMAIN = '<%= @keystone_default_domain %>' # Default OpenStack Dashboard configuration. HORIZON_CONFIG = { - 'default_dashboard': 'project', 'user_home': 'openstack_dashboard.views.get_user_home', 'ajax_queue_limit': 10, 'auto_fade_alerts': {