From 06231ae3782f46b48a652ac0ccaa4b467d027dba Mon Sep 17 00:00:00 2001
From: Javier Pena <jpena@redhat.com>
Date: Tue, 7 Mar 2017 16:13:49 +0100
Subject: [PATCH] Fix VPNaaS setup

We have to use neutron::services:vpnaas in the controller node (not
in the network node), and remove the service_providers entry from
the plugin, as it is already done in the Puppet code.

Backport: stable/ocata

Change-Id: I11efcd52b0f591bcebdccbf4c68551c8faaf5f5d
(cherry picked from commit 7ebadaed5246ef90b7aaf1bef9cbb4ac678db0e8)
---
 README.md                                                     | 1 +
 packstack/puppet/modules/packstack/manifests/neutron/api.pp   | 4 ++++
 .../puppet/modules/packstack/manifests/neutron/vpnaas.pp      | 4 ----
 tests/scenario002.sh                                          | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 5ae02a8e7..2be0dae92 100644
--- a/README.md
+++ b/README.md
@@ -192,6 +192,7 @@ This is the current matrix of available tests:
 | nova       |      X      |      X      |      X      |
 | neutron    |      X      |      X      |      X      |
 | lbaasv2    |             |      X      |             |
+| vpnaas     |             |      X      |             |
 | cinder     |      X      |             |             |
 | ceilometer |             |             |      X      |
 | aodh       |             |             |      X      |
diff --git a/packstack/puppet/modules/packstack/manifests/neutron/api.pp b/packstack/puppet/modules/packstack/manifests/neutron/api.pp
index 17bead7c1..f99d43ca9 100644
--- a/packstack/puppet/modules/packstack/manifests/neutron/api.pp
+++ b/packstack/puppet/modules/packstack/manifests/neutron/api.pp
@@ -40,5 +40,9 @@ class packstack::neutron::api ()
        class { '::neutron::services::lbaas': }
     }
 
+    if $neutron_vpnaas_enabled {
+      class { '::neutron::services::vpnaas': }
+    }
+
     Class['::neutron::server'] -> File['/etc/neutron/api-paste.ini']
 }
diff --git a/packstack/puppet/modules/packstack/manifests/neutron/vpnaas.pp b/packstack/puppet/modules/packstack/manifests/neutron/vpnaas.pp
index 4300b50b2..3dead18dc 100644
--- a/packstack/puppet/modules/packstack/manifests/neutron/vpnaas.pp
+++ b/packstack/puppet/modules/packstack/manifests/neutron/vpnaas.pp
@@ -3,9 +3,5 @@ class packstack::neutron::vpnaas ()
     class { '::neutron::agents::vpnaas':
       enabled           => true,
       vpn_device_driver => 'neutron_vpnaas.services.vpn.device_drivers.libreswan_ipsec.LibreSwanDriver',
-    } ->
-    class { '::neutron::services::vpnaas':
-      service_providers => 'VPN:libreswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default',
-      notify            => Service['neutron-server'],
     }
 }
diff --git a/tests/scenario002.sh b/tests/scenario002.sh
index 029e06513..8e07f570b 100755
--- a/tests/scenario002.sh
+++ b/tests/scenario002.sh
@@ -29,6 +29,7 @@ $SUDO packstack ${ADDITIONAL_ARGS} \
           --nagios-install=n \
           --glance-backend=swift \
           --os-neutron-lbaas-install=y \
+          --os-neutron-vpnaas-install=y \
           --os-sahara-install=y \
           --os-trove-install=y \
           --provision-uec-kernel-url="/tmp/cirros/cirros-0.3.4-x86_64-vmlinuz" \