From 0ebec5d29c1da08bbc4643d38f2b6be98473f850 Mon Sep 17 00:00:00 2001 From: zhubingbing <1392607554@qq.com> Date: Fri, 11 Nov 2016 08:28:47 +0000 Subject: Install cloudkitty dashboard in horizon image Co-Authored-By: Jeffrey Zhang Change-Id: I6bb33de6d19ba42710e6d4138059c23076b759ec Closes-Bug: #1641053 --- docker/horizon/Dockerfile.j2 | 1 + docker/horizon/extend_start.sh | 9 +++++++++ kolla/common/config.py | 4 ++++ 3 files changed, 14 insertions(+) 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 diff --git a/kolla/common/config.py b/kolla/common/config.py index b5f00d6b9..33809abd2 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -214,6 +214,10 @@ SOURCES = { 'type': 'url', 'location': ('http://tarballs.openstack.org/horizon/' 'horizon-master.tar.gz')}, + 'horizon-plugin-cloudkitty-dashboard': { + 'type': 'url', + 'location': ('http://tarballs.openstack.org/cloudkitty-dashboard/' + 'cloudkitty-dashboard-master.tar.gz')}, 'horizon-plugin-ironic-ui': { 'type': 'url', 'location': ('http://tarballs.openstack.org/ironic-ui/' -- cgit v1.2.3