diff options
| author | Zuul <zuul@review.openstack.org> | 2018-01-08 07:05:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-01-08 07:05:50 +0000 |
| commit | 56f35234eb236a5cafff391a17b4b491a2d2bcee (patch) | |
| tree | 3704b3247010d33473687cb78c6a8f4ab2002fac | |
| parent | bee9ea39ff1b1c960c5f4f8f1a26fcced71a4ec3 (diff) | |
| parent | ca227b38c1fbfc8a4f3b499586854bc8d5c0ab8f (diff) | |
| download | kolla-56f35234eb236a5cafff391a17b4b491a2d2bcee.tar.gz kolla-56f35234eb236a5cafff391a17b4b491a2d2bcee.zip | |
Merge "Add vitrage dashbord into horizon image"
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/horizon/extend_start.sh | 9 | ||||
| -rwxr-xr-x | kolla/common/config.py | 4 |
3 files changed, 15 insertions, 1 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index 0e863b9ee..19c98ea0d 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -24,7 +24,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openstack-murano-ui', 'openstack-neutron-lbaas-ui', 'openstack-sahara-ui', - 'openstack-trove-ui' + 'openstack-trove-ui', + 'openstack-vitrage-ui' ] %} {{ macros.install_packages(horizon_packages | customizable("packages")) }} diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index 454e1fa49..d8e31cf7e 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -199,6 +199,14 @@ function config_trove_dashboard { done } +function config_vitrage_dashboard { + for file in ${SITE_PACKAGES}/vitrage_dashboard/enabled/_*[^__].py; do + config_dashboard "${ENABLE_VITRAGE}" \ + "${SITE_PACKAGES}/vitrage_dashboard/anabled/${file##*/}" \ + "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}" + done +} + function config_watcher_dashboard { for file in ${SITE_PACKAGES}/watcher_dashboard/local/enabled/_*[^__].py; do config_dashboard "${ENABLE_WATCHER}" \ @@ -245,6 +253,7 @@ config_senlin_dashboard config_solum_dashboard config_tacker_dashboard config_trove_dashboard +config_vitrage_dashboard config_watcher_dashboard config_zaqar_dashboard config_zun_dashboard diff --git a/kolla/common/config.py b/kolla/common/config.py index 4bcda4170..0acc587d5 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -431,6 +431,10 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/trove-dashboard/' 'trove-dashboard-master.tar.gz')}, + 'horizon-plugin-vitrage-dashboard': { + 'type': 'url', + 'location': ('$tarballs_base/vitrage-dashboard/' + 'vitrage-dashboard-master.tar.gz')}, 'horizon-plugin-watcher-dashboard': { 'type': 'url', 'location': ('$tarballs_base/watcher-dashboard/' |