From 3ae7ae00100a80fed5a68b0732b85adb86b75c45 Mon Sep 17 00:00:00 2001
From: Alfredo Moralejo <amoralej@redhat.com>
Date: Tue, 31 Oct 2017 16:21:31 +0100
Subject: [PATCH] Disable vpnaas from scenario002

https://review.openstack.org/#/c/488247/ has removed
neutron-vpn-agent and added the agent as a extension
for l3-agent. This needs changes in puppet-neutron.
Until change is merged, let's remove it from tests.

Change-Id: I95dca9d222463d1ec6e9afcb3a6e44013d6672f1
---
 README.md            | 2 +-
 tests/scenario002.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b166aa3d0..7e0dc151f 100644
--- a/README.md
+++ b/README.md
@@ -179,7 +179,7 @@ This is the current matrix of available tests:
 | neutron        |      X      |      X      |      X      |
 | neutron plugin |     ovn     |     ovs     |     ovs     |
 | lbaasv2        |             |      X      |             |
-| vpnaas         |             |      X      |             |
+| vpnaas         |             |             |             |
 | cinder         |      X      |             |             |
 | ceilometer     |             |             |      X      |
 | aodh           |             |             |      X      |
diff --git a/tests/scenario002.sh b/tests/scenario002.sh
index 2b54a4169..fcdd0b2bb 100755
--- a/tests/scenario002.sh
+++ b/tests/scenario002.sh
@@ -27,7 +27,7 @@ $SUDO packstack ${ADDITIONAL_ARGS} \
           --os-horizon-install=n \
           --glance-backend=swift \
           --os-neutron-lbaas-install=y \
-          --os-neutron-vpnaas-install=y \
+          --os-neutron-vpnaas-install=n \
           --os-sahara-install=y \
           --os-trove-install=y \
           --keystone-token-format=UUID \