From 7d7005e412f59028b00369ec7ab4997aa5d177f9 Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Sun, 24 Sep 2017 13:26:03 +0800 Subject: Add neutron-fwaas-dashboard into horizon image neutron-fwaas-dashboard is split into standalone repo. Need install it into horizon image. Change-Id: Ic1ff58df2c23db77aace95fd6d4eabbd62227e3b Closes-Bug: #1719147 --- docker/horizon/extend_start.sh | 9 +++++++++ kolla/common/config.py | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index 418bc40ba..447d2a723 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -56,6 +56,14 @@ function config_designate_dashboard { done } +function config_fwaas_dashboard { + for file in ${SITE_PACKAGES}/neutron_fwaas_dashboard/enabled/_*[^__].py; do + config_dashboard "${ENABLE_FWAAS}" \ + "${SITE_PACKAGES}/neutron_fwaas_dashboard/enabled/${file##*/}" \ + "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}" + done +} + function config_freezer_ui { for file in ${SITE_PACKAGES}/disaster_recovery/enabled/_*[^__].py; do config_dashboard "${ENABLE_FREEZER}" \ @@ -213,6 +221,7 @@ function config_zun_dashboard { config_cloudkitty_dashboard config_designate_dashboard +config_fwaas_dashboard config_freezer_ui config_ironic_dashboard config_karbor_dashboard diff --git a/kolla/common/config.py b/kolla/common/config.py index 2ba933a7e..22d6dd2bb 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -359,6 +359,10 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/designate-dashboard/' 'designate-dashboard-master.tar.gz')}, + 'horizon-plugin-fwaas-dashboard': { + 'type': 'url', + 'location': ('$tarballs_base/neutron-fwaas-dashboard/' + 'neutron-fwaas-dashboard-master.tar.gz')}, 'horizon-plugin-freezer-web-ui': { 'type': 'url', 'location': ('$tarballs_base/freezer-web-ui/' -- cgit v1.2.3