From 09b8a7d9e1a2199625c30ff274523b3070d37e74 Mon Sep 17 00:00:00 2001
From: Damian Cikowski <damian@geo-com.pl>
Date: Wed, 14 Nov 2018 00:02:37 +0100
Subject: [PATCH] Add Neutron VPNaaS Dashboard to Horizon

This patch brings back VPNaaS Dashboard after its split out
into a separate project.

Change-Id: Iefa92fdb348df6d07bc557749e1f96dd47c68e30
---
 defaults/main.yml                                        | 8 ++++++++
 .../notes/neutron-vpnaas-dashboard-19f4ef09faae1f70.yaml | 9 +++++++++
 tasks/horizon_install_source.yml                         | 1 +
 templates/horizon_local_settings.py.j2                   | 1 +
 4 files changed, 19 insertions(+)
 create mode 100644 releasenotes/notes/neutron-vpnaas-dashboard-19f4ef09faae1f70.yaml

diff --git a/defaults/main.yml b/defaults/main.yml
index 91de19ac..45b3d9b9 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -72,6 +72,10 @@ heat_dashboard_git_install_branch: master
 zun_dashboard_git_repo: https://git.openstack.org/openstack/zun-ui
 zun_dashboard_git_install_branch: master
 
+# The git source/branch for the Neutron VPNaaS UI plugin
+neutron_vpnaas_dashboard_git_repo: https://git.openstack.org/cgit/openstack/neutron-vpnaas-dashboard
+neutron_vpnaas_dashboard_git_install_branch: master
+
 ## The packages to build from source (used in developer mode)
 horizon_developer_constraints:
   - "git+{{ horizon_git_repo }}@{{ horizon_git_install_branch }}#egg=horizon"
@@ -83,6 +87,7 @@ horizon_developer_constraints:
   - "git+{{ trove_dashboard_git_repo }}@{{ trove_dashboard_git_install_branch }}#egg=trove_dashboard"
   - "git+{{ heat_dashboard_git_repo }}@{{ heat_dashboard_git_install_branch }}#egg=heat_dashboard"
   - "git+{{ zun_dashboard_git_repo }}@{{ zun_dashboard_git_install_branch }}#egg=zun_ui"
+  - "git+{{ neutron_vpnaas_dashboard_git_repo }}@{{ neutron_vpnaas_dashboard_git_install_branch }}#egg=neutron_vpnaas_dashboard"
 
 # TODO(odyssey4me):
 # This can be simplified once all the roles are using
@@ -290,6 +295,7 @@ horizon_enable_heat_ui: False
 ## Neutron features to enable
 horizon_enable_neutron_lbaas: False
 horizon_enable_neutron_fwaas: False
+horizon_enable_neutron_vpnaas: False
 
 ## Zun UI Panel
 horizon_enable_zun_ui: False
@@ -389,6 +395,8 @@ horizon_neutron_fwaas_optional_pip_packages:
   - neutron-fwaas-dashboard
 horizon_neutron_lbaas_optional_pip_packages:
   - neutron-lbaas-dashboard
+horizon_neutron_vpnaas_optional_pip_packages:
+  - neutron-vpnaas-dashboard
 horizon_octavia_optional_pip_packages:
   - octavia_dashboard
 horizon_sahara_optional_pip_packages:
diff --git a/releasenotes/notes/neutron-vpnaas-dashboard-19f4ef09faae1f70.yaml b/releasenotes/notes/neutron-vpnaas-dashboard-19f4ef09faae1f70.yaml
new file mode 100644
index 00000000..fc74de49
--- /dev/null
+++ b/releasenotes/notes/neutron-vpnaas-dashboard-19f4ef09faae1f70.yaml
@@ -0,0 +1,9 @@
+---
+features:
+  - |
+    VPNaaS dashboard is again available in Horizon. Deployers can enable
+    the panel by setting the following Ansible variable:
+
+    .. code-block:: yaml
+
+        horizon_enable_neutron_vpnaas: True
diff --git a/tasks/horizon_install_source.yml b/tasks/horizon_install_source.yml
index 610f2f4c..b5aae0e5 100644
--- a/tasks/horizon_install_source.yml
+++ b/tasks/horizon_install_source.yml
@@ -76,6 +76,7 @@
          (horizon_enable_magnum_ui | bool) | ternary(horizon_magnum_optional_pip_packages, []) +
          (horizon_enable_neutron_fwaas | bool) | ternary(horizon_neutron_fwaas_optional_pip_packages, []) +
          (horizon_enable_neutron_lbaas | bool) | ternary(horizon_neutron_lbaas_optional_pip_packages, []) +
+         (horizon_enable_neutron_vpnaas | bool) | ternary(horizon_neutron_vpnaas_optional_pip_packages, []) +
          (horizon_enable_octavia_ui | bool) | ternary(horizon_octavia_optional_pip_packages, []) +
          (horizon_enable_sahara_ui | bool) | ternary(horizon_sahara_optional_pip_packages, []) +
          (horizon_enable_tacker_ui | bool) | ternary(horizon_tacker_optional_pip_packages, []) +
diff --git a/templates/horizon_local_settings.py.j2 b/templates/horizon_local_settings.py.j2
index e6aa1d02..56523d54 100644
--- a/templates/horizon_local_settings.py.j2
+++ b/templates/horizon_local_settings.py.j2
@@ -294,6 +294,7 @@ OPENSTACK_NEUTRON_NETWORK = {
     'enable_ipv6': {{ horizon_enable_ipv6 | bool }},
     'enable_distributed_router': False,
     'enable_lb': {{ horizon_enable_neutron_lbaas | bool }},
+    'enable_vpn': {{ horizon_enable_neutron_vpnaas | bool }},
     'enable_ha_router': {{ horizon_enable_ha_router | bool }},
     'enable_fip_topology_check': True,