diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-07-04 10:49:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-07-04 10:49:22 +0000 |
| commit | c3635c5beb811cb744e1d24b0b14588d4e50be49 (patch) | |
| tree | c9619dc622bdb4e66d78250227c9cd9f0c59aba2 | |
| parent | b986d4e8a48860a1201746f8bdad8f120e2a93f1 (diff) | |
| parent | 940e93f7c657e8a7cf1652e71ee3dbf62d82b1e4 (diff) | |
| download | kolla-c3635c5beb811cb744e1d24b0b14588d4e50be49.tar.gz kolla-c3635c5beb811cb744e1d24b0b14588d4e50be49.zip | |
Merge "Install zun ui into horizon image"
| -rw-r--r-- | docker/horizon/extend_start.sh | 9 | ||||
| -rwxr-xr-x | kolla/common/config.py | 4 |
2 files changed, 13 insertions, 0 deletions
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index 302560f3b..9807ce7fc 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -198,6 +198,14 @@ function config_zaqar_dashboard { done } +function config_zun_dashboard { + for file in ${SITE_PACKAGES}/zun_ui/enabled/_*[^__].py; do + config_dashboard "${ENABLE_ZUN}" \ + "${SITE_PACKAGES}/zun_ui/enabled/${file##*/}" \ + "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}" + done +} + config_cloudkitty_dashboard config_designate_dashboard config_freezer_ui @@ -216,6 +224,7 @@ config_tacker_dashboard config_trove_dashboard config_watcher_dashboard config_zaqar_dashboard +config_zun_dashboard # NOTE(pbourke): httpd will not clean up after itself in some cases which # results in the container not being able to restart. (bug #1489676, 1557036) diff --git a/kolla/common/config.py b/kolla/common/config.py index 2eb8960eb..f71793490 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -417,6 +417,10 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/zaqar-ui/' 'zaqar-ui-master.tar.gz')}, + 'horizon-plugin-zun-ui': { + 'type': 'url', + 'location': ('$tarballs_base/zun-ui/' + 'zun-ui-master.tar.gz')}, 'ironic-base': { 'type': 'url', 'location': ('$tarballs_base/ironic/' |