diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-30 11:16:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-30 11:16:45 +0000 |
| commit | efecaede6ddf2b48bdb6ea0cd3e195151b58e60d (patch) | |
| tree | 07c8d4f23567ed1c24d0bae3bdd6b0a90de7873d | |
| parent | e74f947ff74659e61b3bdbbce65a2aab772812c3 (diff) | |
| parent | 0ebec5d29c1da08bbc4643d38f2b6be98473f850 (diff) | |
| download | kolla-efecaede6ddf2b48bdb6ea0cd3e195151b58e60d.tar.gz kolla-efecaede6ddf2b48bdb6ea0cd3e195151b58e60d.zip | |
Merge "Install cloudkitty dashboard in horizon image"
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/horizon/extend_start.sh | 9 | ||||
| -rw-r--r-- | kolla/common/config.py | 4 |
3 files changed, 14 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 diff --git a/kolla/common/config.py b/kolla/common/config.py index 42c4b3ae4..cbdc31b06 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -202,6 +202,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/' |