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

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      |

packstack/puppet/modules/packstack/manifests/neutron/api.pp

@@ -40,5 +40,9 @@
        class { '::neutron::services::lbaas': }
     }
 
+    if $neutron_vpnaas_enabled {
+      class { '::neutron::services::vpnaas': }
+    }
+
     Class['::neutron::server'] -> File['/etc/neutron/api-paste.ini']
 }

packstack/puppet/modules/packstack/manifests/neutron/vpnaas.pp

@@ -3,9 +3,5 @@
     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'],
     }
 }

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 \
           --keystone-token-format=UUID \