diff options
| author | Zuul <zuul@review.openstack.org> | 2018-04-26 11:15:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-04-26 11:15:38 +0000 |
| commit | a39c52c4467f44b53175d26aba7d5608b23a7048 (patch) | |
| tree | 6ba0e5c3cd407006d91f281df6074f6ddfc99897 | |
| parent | 27a58fb20b34a828e4e309cd8714050283fd8f5f (diff) | |
| parent | 94dfe6be4992e244c6fb62b5289012c0d7d5cd37 (diff) | |
| download | kolla-a39c52c4467f44b53175d26aba7d5608b23a7048.tar.gz kolla-a39c52c4467f44b53175d26aba7d5608b23a7048.zip | |
Merge "Add blazar-dashboard into horizon image"
| -rw-r--r-- | docker/horizon/extend_start.sh | 9 | ||||
| -rwxr-xr-x | kolla/common/config.py | 4 | ||||
| -rw-r--r-- | releasenotes/notes/add-blazar-dashboard-e201d1aeeccc0eaa.yaml | 2 |
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 933db4fe8..fd7aca134 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -365,6 +365,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. |