From c4449bc4e288762d751f94bf6a0fb1cea775298b Mon Sep 17 00:00:00 2001
From: Rodrigo Barbieri <rodrigob@netapp.com>
Date: Fri, 19 Jan 2018 08:06:53 -0200
Subject: [PATCH] Enable IPv6 scenario tests in Upstream CI

This change complements the work of preceding IPv6 scenario
test changes [1,2] by enabling the settings that allow the tests
to be run in the Upstream CI.

[1] I4ca727f92618998242af18908bbbda6bb5f86303
[2] Id8b005cdd429d53a75624885fe7ca795746c3ede

Change-Id: I705b7d9cbc14d4bbc4d89b4c343205908758a5cb
Depends-on: Id8b005cdd429d53a75624885fe7ca795746c3ede
Depends-on: I4ca727f92618998242af18908bbbda6bb5f86303
---
 contrib/ci/post_test_hook.sh                                   | 1 +
 contrib/ci/pre_test_hook.sh                                    | 1 +
 .../legacy/manila-tempest-minimal-dsvm-lvm-centos-7/run.yaml   | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/contrib/ci/post_test_hook.sh b/contrib/ci/post_test_hook.sh
index ab11bf5138..c868dc2a16 100755
--- a/contrib/ci/post_test_hook.sh
+++ b/contrib/ci/post_test_hook.sh
@@ -179,6 +179,7 @@ if [[ "$DRIVER" == "lvm" ]]; then
     RUN_MANILA_SHRINK_TESTS=False
     RUN_MANILA_REVERT_TO_SNAPSHOT_TESTS=True
     RUN_MANILA_MOUNT_SNAPSHOT_TESTS=True
+    RUN_MANILA_IPV6_TESTS=True
     iniset $TEMPEST_CONFIG share enable_ip_rules_for_protocols 'nfs'
     iniset $TEMPEST_CONFIG share enable_user_rules_for_protocols 'cifs'
     iniset $TEMPEST_CONFIG share image_with_share_tools 'manila-service-image-master'
diff --git a/contrib/ci/pre_test_hook.sh b/contrib/ci/pre_test_hook.sh
index 1bfd886f7b..67bfd2c183 100755
--- a/contrib/ci/pre_test_hook.sh
+++ b/contrib/ci/pre_test_hook.sh
@@ -143,6 +143,7 @@ elif [[ "$DRIVER" == "lvm" ]]; then
 
     echo "SHARE_DRIVER=manila.share.drivers.lvm.LVMShareDriver" >> $localconf
     echo "SHARE_BACKING_FILE_SIZE=32000M" >> $localconf
+    export MANILA_SETUP_IPV6=True
 elif [[ "$DRIVER" == "zfsonlinux" ]]; then
     MANILA_SERVICE_IMAGE_ENABLED=True
     echo "SHARE_DRIVER=manila.share.drivers.zfsonlinux.driver.ZFSonLinuxShareDriver" >> $localconf
diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/run.yaml
index cbb0767852..f69308102c 100644
--- a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/run.yaml
+++ b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/run.yaml
@@ -54,6 +54,9 @@
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
 
+          export MANILA_SETUP_IPV6=True
+          export RUN_MANILA_IPV6_TESTS=True
+
           # Basic services needed for minimal job
           OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest
           if [ "lvm" == "lvm" ]; then