From 94dfe6be4992e244c6fb62b5289012c0d7d5cd37 Mon Sep 17 00:00:00 2001 From: caoyuan Date: Thu, 19 Apr 2018 22:21:51 +0800 Subject: Add blazar-dashboard into horizon image Change-Id: I67876c734d147593a188ba385b60e02350b44fae --- docker/horizon/extend_start.sh | 9 +++++++++ kolla/common/config.py | 4 ++++ releasenotes/notes/add-blazar-dashboard-e201d1aeeccc0eaa.yaml | 2 ++ 3 files changed, 15 insertions(+) create mode 100644 releasenotes/notes/add-blazar-dashboard-e201d1aeeccc0eaa.yaml diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index 4c5125123..3fc6a20c2 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -42,6 +42,14 @@ function config_dashboard { fi } +function config_blazar_dashboard { + for file in ${SITE_PACKAGES}/blazar_dashboard/enabled/_*[^__].py; do + config_dashboard "${ENABLE_BLAZAR}" \ + "${SITE_PACKAGES}/blazar_dashboard/enabled/${file##*/}" \ + "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}" + done +} + function config_cloudkitty_dashboard { for file in ${SITE_PACKAGES}/cloudkittydashboard/enabled/_*[^__].py; do config_dashboard "${ENABLE_CLOUDKITTY}" \ @@ -243,6 +251,7 @@ function config_zun_dashboard { done } +config_blazar_dashboard config_cloudkitty_dashboard config_designate_dashboard config_fwaas_dashboard diff --git a/kolla/common/config.py b/kolla/common/config.py index e2520bcf1..beff8345d 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -363,6 +363,10 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/horizon/' 'horizon-master.tar.gz')}, + 'horizon-plugin-blazar-dashboard': { + 'type': 'url', + 'location': ('$tarballs_base/blazar-dashboard/' + 'blazar-dashboard-master.tar.gz')}, 'horizon-plugin-cloudkitty-dashboard': { 'type': 'url', 'location': ('$tarballs_base/cloudkitty-dashboard/' diff --git a/releasenotes/notes/add-blazar-dashboard-e201d1aeeccc0eaa.yaml b/releasenotes/notes/add-blazar-dashboard-e201d1aeeccc0eaa.yaml new file mode 100644 index 000000000..a554166f8 --- /dev/null +++ b/releasenotes/notes/add-blazar-dashboard-e201d1aeeccc0eaa.yaml @@ -0,0 +1,2 @@ +features: + - Add blazar-dashboard to horizon image. -- cgit v1.2.3