diff options
| author | Zuul <zuul@review.openstack.org> | 2018-06-20 15:13:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-06-20 15:13:54 +0000 |
| commit | 2954754eb85d6f3f8bdd15f55afd7ca19f41b235 (patch) | |
| tree | abb5bb6cbe578d4a915ac5eed2e7ff19f281a6d2 | |
| parent | f0cabe689039773758a0a15262fa45b119a7b9a4 (diff) | |
| parent | 29c1ad152b1deec17379f164722c38e8e682acf4 (diff) | |
| download | kolla-2954754eb85d6f3f8bdd15f55afd7ca19f41b235.tar.gz kolla-2954754eb85d6f3f8bdd15f55afd7ca19f41b235.zip | |
Merge "Add neutron-vpnaas-dashboard into horizon image"
| -rw-r--r-- | docker/horizon/extend_start.sh | 7 | ||||
| -rwxr-xr-x | 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 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/' |