From 023917a172a2ca1db0900adddc385c231f08431e Mon Sep 17 00:00:00 2001 From: jianyi Date: Wed, 14 Dec 2016 16:14:07 +0800 Subject: [PATCH] Install solum dashboard into horizon image Co-Authored-By: caoyuan Change-Id: I531ef11f11920bb9db4b0cba43038694998afcf3 Closes-Bug: #1648709 --- docker/horizon/extend_start.sh | 7 +++++++ kolla/common/config.py | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index a100a2c944..444ac9a472 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -107,6 +107,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 3dfd4ede08..aab7e17923 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -246,6 +246,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/'