diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-12-16 22:42:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-12-16 22:42:34 +0000 |
| commit | 26fb747b0a6ecf63fcb003836d80799779e6b50e (patch) | |
| tree | 768c49364ef0d6bde6ca506c93e28b7cb133ac13 | |
| parent | f62b16f8a447b7c90da3844720a200fb4d3ef5d5 (diff) | |
| parent | 023917a172a2ca1db0900adddc385c231f08431e (diff) | |
| download | kolla-26fb747b0a6ecf63fcb003836d80799779e6b50e.tar.gz kolla-26fb747b0a6ecf63fcb003836d80799779e6b50e.zip | |
Merge "Install solum dashboard into horizon image"
| -rw-r--r-- | docker/horizon/extend_start.sh | 7 | ||||
| -rw-r--r-- | kolla/common/config.py | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index 826a3d989..b686c3c8a 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -123,6 +123,12 @@ function config_senlin_dashboard { "${SITE_PACKAGES}/openstack_dashboard/conf/senlin_policy.json" } +function config_solum_dashboard { + config_dashboard "${ENABLE_SOLUM}" \ + "${SITE_PACKAGES}/solum_dashboard/_50_solum.py.example" \ + "${SITE_PACKAGES}/openstack_dashboard/local/enabled/_50_solum.py" +} + function config_trove_dashboard { for file in ${SITE_PACKAGES}/trove_dashboard/enabled/_*[^__].py; do config_dashboard "${ENABLE_TROVE}" \ @@ -161,6 +167,7 @@ config_neutron_lbaas config_sahara_dashboard config_searchlight_ui config_senlin_dashboard +config_solum_dashboard config_trove_dashboard config_watcher_dashboard config_zaqar_dashboard diff --git a/kolla/common/config.py b/kolla/common/config.py index 8a3b4eeeb..edebd5022 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -250,6 +250,10 @@ SOURCES = { 'type': 'url', 'location': ('http://tarballs.openstack.org/senlin-dashboard/' 'senlin-dashboard-master.tar.gz')}, + 'horizon-plugin-solum-dashboard': { + 'type': 'url', + 'location': ('http://tarballs.openstack.org/solum-dashboard/' + 'solum-dashboard-master.tar.gz')}, 'horizon-plugin-trove-dashboard': { 'type': 'url', 'location': ('http://tarballs.openstack.org/trove-dashboard/' |