aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorzhubingbing <1392607554@qq.com>2016-11-11 08:28:47 +0000
committerJeffrey Zhang <zhang.lei.fly@gmail.com>2016-11-29 15:38:21 +0800
commit0ebec5d29c1da08bbc4643d38f2b6be98473f850 (patch)
tree7d3ba72ef648fc514589b52db02c0810dbef05c5 /docker
parentfb353b73ad8ee3b91b20b10b949c954b73bfe05d (diff)
downloadkolla-0ebec5d29c1da08bbc4643d38f2b6be98473f850.tar.gz
kolla-0ebec5d29c1da08bbc4643d38f2b6be98473f850.zip
Install cloudkitty dashboard in horizon image
Co-Authored-By: Jeffrey Zhang <jeffrey.zhang@99cloud.net> Change-Id: I6bb33de6d19ba42710e6d4138059c23076b759ec Closes-Bug: #1641053
Diffstat (limited to 'docker')
-rw-r--r--docker/horizon/Dockerfile.j21
-rw-r--r--docker/horizon/extend_start.sh9
2 files changed, 10 insertions, 0 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2
index ff98dd8fb..fce3c5ac2 100644
--- a/docker/horizon/Dockerfile.j2
+++ b/docker/horizon/Dockerfile.j2
@@ -13,6 +13,7 @@ MAINTAINER {{ maintainer }}
'httpd',
'mod_wsgi',
'gettext',
+ 'openstack-cloudkitty-ui',
'openstack-neutron-lbaas-ui',
'openstack-sahara-ui'
] %}
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh
index 720a547be..60a2a5a88 100644
--- a/docker/horizon/extend_start.sh
+++ b/docker/horizon/extend_start.sh
@@ -35,6 +35,14 @@ function config_dashboard {
fi
}
+function config_cloudkitty_dashboard {
+ for file in ${SITE_PACKAGES}/cloudkittydashboard/enabled/_*[^__].py; do
+ config_dashboard "${ENABLE_CLOUDKITTY}" \
+ "${SITE_PACKAGES}/cloudkittydashboard/enabled/${file##*/}" \
+ "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}"
+ done
+}
+
function config_ironic_dashboard {
for file in ${SITE_PACKAGES}/ironic_ui/enabled/_*[^__].py; do
config_dashboard "${ENABLE_IRONIC}" \
@@ -57,6 +65,7 @@ function config_sahara_dashboard {
done
}
+config_cloudkitty_dashboard
config_sahara_dashboard
config_ironic_dashboard
config_neutron_lbaas