From da5cda0f993691f6b104a553548e12b388d8f11d Mon Sep 17 00:00:00 2001 From: Yumeng_Bao Date: Sat, 4 Feb 2017 20:11:45 +0800 Subject: [PATCH] Refactor the watcher dashboard enable file We should refactor the watcher dashboard enable file, and this will keep watcher more consist with horizon Change-Id: Ia4cf981b10adcb0d8f3893b755c1a90fd267c491 --- devstack/plugin.sh | 2 +- watcher_dashboard/{enabled => local}/__init__.py | 0 watcher_dashboard/{ => local}/enabled/_31000_goals_panel.py | 0 .../{ => local}/enabled/_31010_strategies_panel.py | 0 .../{ => local}/enabled/_31020_watcher_panelgroup.py | 0 .../{ => local}/enabled/_31030_audit_templates_panel.py | 0 watcher_dashboard/{ => local}/enabled/_31040_audits_panel.py | 0 .../{ => local}/enabled/_31050_action_plans_panel.py | 0 watcher_dashboard/{ => local}/enabled/_31060_actions_panel.py | 0 watcher_dashboard/local/enabled/__init__.py | 0 watcher_dashboard/test/settings.py | 2 +- 11 files changed, 2 insertions(+), 2 deletions(-) rename watcher_dashboard/{enabled => local}/__init__.py (100%) rename watcher_dashboard/{ => local}/enabled/_31000_goals_panel.py (100%) rename watcher_dashboard/{ => local}/enabled/_31010_strategies_panel.py (100%) rename watcher_dashboard/{ => local}/enabled/_31020_watcher_panelgroup.py (100%) rename watcher_dashboard/{ => local}/enabled/_31030_audit_templates_panel.py (100%) rename watcher_dashboard/{ => local}/enabled/_31040_audits_panel.py (100%) rename watcher_dashboard/{ => local}/enabled/_31050_action_plans_panel.py (100%) rename watcher_dashboard/{ => local}/enabled/_31060_actions_panel.py (100%) create mode 100644 watcher_dashboard/local/enabled/__init__.py diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 5520d2c..6a8e5a9 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -7,7 +7,7 @@ function install_watcher_dashboard { } function configure_watcher_dashboard { - cp -a ${WATCHER_DASHBOARD_DIR}/watcher_dashboard/enabled/* ${DEST}/horizon/openstack_dashboard/local/enabled/ + cp -a ${WATCHER_DASHBOARD_DIR}/watcher_dashboard/local/enabled/* ${DEST}/horizon/openstack_dashboard/local/enabled/ cp -a ${WATCHER_DASHBOARD_DIR}/watcher_dashboard/conf/* ${DEST}/horizon/openstack_dashboard/conf/ } diff --git a/watcher_dashboard/enabled/__init__.py b/watcher_dashboard/local/__init__.py similarity index 100% rename from watcher_dashboard/enabled/__init__.py rename to watcher_dashboard/local/__init__.py diff --git a/watcher_dashboard/enabled/_31000_goals_panel.py b/watcher_dashboard/local/enabled/_31000_goals_panel.py similarity index 100% rename from watcher_dashboard/enabled/_31000_goals_panel.py rename to watcher_dashboard/local/enabled/_31000_goals_panel.py diff --git a/watcher_dashboard/enabled/_31010_strategies_panel.py b/watcher_dashboard/local/enabled/_31010_strategies_panel.py similarity index 100% rename from watcher_dashboard/enabled/_31010_strategies_panel.py rename to watcher_dashboard/local/enabled/_31010_strategies_panel.py diff --git a/watcher_dashboard/enabled/_31020_watcher_panelgroup.py b/watcher_dashboard/local/enabled/_31020_watcher_panelgroup.py similarity index 100% rename from watcher_dashboard/enabled/_31020_watcher_panelgroup.py rename to watcher_dashboard/local/enabled/_31020_watcher_panelgroup.py diff --git a/watcher_dashboard/enabled/_31030_audit_templates_panel.py b/watcher_dashboard/local/enabled/_31030_audit_templates_panel.py similarity index 100% rename from watcher_dashboard/enabled/_31030_audit_templates_panel.py rename to watcher_dashboard/local/enabled/_31030_audit_templates_panel.py diff --git a/watcher_dashboard/enabled/_31040_audits_panel.py b/watcher_dashboard/local/enabled/_31040_audits_panel.py similarity index 100% rename from watcher_dashboard/enabled/_31040_audits_panel.py rename to watcher_dashboard/local/enabled/_31040_audits_panel.py diff --git a/watcher_dashboard/enabled/_31050_action_plans_panel.py b/watcher_dashboard/local/enabled/_31050_action_plans_panel.py similarity index 100% rename from watcher_dashboard/enabled/_31050_action_plans_panel.py rename to watcher_dashboard/local/enabled/_31050_action_plans_panel.py diff --git a/watcher_dashboard/enabled/_31060_actions_panel.py b/watcher_dashboard/local/enabled/_31060_actions_panel.py similarity index 100% rename from watcher_dashboard/enabled/_31060_actions_panel.py rename to watcher_dashboard/local/enabled/_31060_actions_panel.py diff --git a/watcher_dashboard/local/enabled/__init__.py b/watcher_dashboard/local/enabled/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/watcher_dashboard/test/settings.py b/watcher_dashboard/test/settings.py index 5c03fc0..9611b0e 100644 --- a/watcher_dashboard/test/settings.py +++ b/watcher_dashboard/test/settings.py @@ -143,7 +143,7 @@ settings_utils.find_static_files(HORIZON_CONFIG, AVAILABLE_THEMES, dashboard_module_names = [ 'openstack_dashboard.enabled', 'openstack_dashboard.local.enabled', - 'watcher_dashboard.enabled', + 'watcher_dashboard.local.enabled', ] dashboard_modules = [] # All dashboards must be enabled for the namespace to get registered, which is