aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcaoyuan <cao.yuan@99cloud.net>2018-04-19 22:21:51 +0800
committercaoyuan <cao.yuan@99cloud.net>2018-04-20 02:33:36 +0000
commit94dfe6be4992e244c6fb62b5289012c0d7d5cd37 (patch)
tree29938b683710391ab2ff4ed86db7eb32beb72b14
parentd99fde03e1641ebba51710161c202e9c3bdb4c31 (diff)
downloadkolla-94dfe6be4992e244c6fb62b5289012c0d7d5cd37.tar.gz
kolla-94dfe6be4992e244c6fb62b5289012c0d7d5cd37.zip
Add blazar-dashboard into horizon image
Change-Id: I67876c734d147593a188ba385b60e02350b44fae
-rw-r--r--docker/horizon/extend_start.sh9
-rwxr-xr-xkolla/common/config.py4
-rw-r--r--releasenotes/notes/add-blazar-dashboard-e201d1aeeccc0eaa.yaml2
3 files changed, 15 insertions, 0 deletions
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.