diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-12-05 12:44:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-12-05 12:44:39 +0000 |
| commit | 4ccff834096e9d4db515923ff83c1c0ce55b0ee9 (patch) | |
| tree | d46424e5d120182ec6ee39628fc075243ca8f9c6 | |
| parent | 3dfe8ff566c9a5b701be0c70eaddcc6bcc08387a (diff) | |
| parent | 8667027d1f102c43a8bc308c115efc7f1a9f39fe (diff) | |
| download | kolla-4ccff834096e9d4db515923ff83c1c0ce55b0ee9.tar.gz kolla-4ccff834096e9d4db515923ff83c1c0ce55b0ee9.zip | |
Merge "Install magnum dashboard into the horizon image"
| -rw-r--r-- | docker/horizon/extend_start.sh | 9 | ||||
| -rw-r--r-- | 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 6e1f82b1b..32ce3a409 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -51,6 +51,14 @@ function config_ironic_dashboard { done } +function config_magnum_dashboard { + for file in ${SITE_PACKAGES}/magnum_ui/enabled/_*[^__].py; do + config_dashboard "${ENABLE_MAGNUM}" \ + "${SITE_PACKAGES}/magnum_ui/enabled/${file##*/}" \ + "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}" + done +} + function config_manila_ui { for file in ${SITE_PACKAGES}/manila_ui/enabled/_*[^__].py; do config_dashboard "${ENABLE_MANILA}" \ @@ -99,6 +107,7 @@ function config_searchlight_ui { config_cloudkitty_dashboard config_ironic_dashboard +config_magnum_dashboard config_manila_ui config_neutron_lbaas config_sahara_dashboard diff --git a/kolla/common/config.py b/kolla/common/config.py index 65b300562..ddf3f72e3 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -210,6 +210,10 @@ SOURCES = { 'type': 'url', 'location': ('http://tarballs.openstack.org/ironic-ui/' 'ironic-ui-master.tar.gz')}, + 'horizon-plugin-magnum-ui': { + 'type': 'url', + 'location': ('http://tarballs.openstack.org/magnum-ui/' + 'magnum-ui-master.tar.gz')}, 'horizon-plugin-manila-ui': { 'type': 'url', 'location': ('http://tarballs.openstack.org/manila-ui/' |