From 29c1ad152b1deec17379f164722c38e8e682acf4 Mon Sep 17 00:00:00 2001 From: "jing.liuqing" Date: Wed, 20 Jun 2018 10:21:15 +0800 Subject: Add neutron-vpnaas-dashboard into horizon image neutron-vpnaas-dashboard is split into standalone repo. Need install it into horizon image. Change-Id: Ife1e39d4fff9e878a101ff716545166a30091f69 Closes-Bug: #1777750 --- 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 20e82c12b..3bb6c7da2 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -168,6 +168,12 @@ function config_neutron_lbaas { "${SITE_PACKAGES}/openstack_dashboard/local/enabled/_1481_project_ng_loadbalancersv2_panel.py" } +function config_neutron_vpnaas_dashboard { + config_dashboard "${ENABLE_NEUTRON_VPNAAS}" \ + "${SITE_PACKAGES}/neutron_vpnaas_dashboard/enabled/_7100_project_vpn_panel.py" \ + "${SITE_PACKAGES}/openstack_dashboard/local/enabled/_7100_project_vpn_panel.py" +} + function config_octavia_dashboard { config_dashboard "${ENABLE_OCTAVIA}" \ "${SITE_PACKAGES}/octavia_dashboard/enabled/_1482_project_load_balancer_panel.py" \ @@ -299,6 +305,7 @@ config_manila_ui config_mistral_dashboard config_murano_dashboard config_neutron_lbaas +config_neutron_vpnaas_dashboard config_octavia_dashboard config_sahara_dashboard config_searchlight_ui diff --git a/kolla/common/config.py b/kolla/common/config.py index 820d18e83..0df4ae236 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -416,6 +416,10 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/neutron-lbaas-dashboard/' 'neutron-lbaas-dashboard-master.tar.gz')}, + 'horizon-plugin-neutron-vpnaas-dashboard': { + 'type': 'url', + 'location': ('$tarballs_base/neutron-vpnaas-dashboard/' + 'neutron-vpnaas-dashboard-master.tar.gz')}, 'horizon-plugin-octavia-dashboard': { 'type': 'url', 'location': ('$tarballs_base/octavia-dashboard/' -- cgit v1.2.3