From e476fc94e07642a9b4243f05ba911ecaf4732ef6 Mon Sep 17 00:00:00 2001
From: Tom Barron <tpb@dyncloud.net>
Date: Wed, 9 Jan 2019 09:49:22 -0500
Subject: [PATCH] Convert functional tests to python3

Depends-On: https://review.openstack.org/#/c/630462/
Change-Id: Ib89f021388bccb925cd19e3792a9c7b524319502
---
 playbooks/legacy/manilaclient-dsvm-neutron-functional/run.yaml | 3 +++
 tox.ini                                                        | 1 +
 2 files changed, 4 insertions(+)

diff --git a/playbooks/legacy/manilaclient-dsvm-neutron-functional/run.yaml b/playbooks/legacy/manilaclient-dsvm-neutron-functional/run.yaml
index 12d6146d8..84e44a45a 100644
--- a/playbooks/legacy/manilaclient-dsvm-neutron-functional/run.yaml
+++ b/playbooks/legacy/manilaclient-dsvm-neutron-functional/run.yaml
@@ -49,6 +49,9 @@
           # Keep localrc to be able to set some vars in pre_test_hook
           export KEEP_LOCALRC=1
 
+          export DEVSTACK_GATE_USE_PYTHON3=True
+          export PYTHON3_VERSION="3.6"
+
           function pre_test_hook {
               source $BASE/new/python-manilaclient/contrib/ci/pre_test_hook.sh
           }
diff --git a/tox.ini b/tox.ini
index 6234b77bb..5b804b1ab 100644
--- a/tox.ini
+++ b/tox.ini
@@ -65,6 +65,7 @@ commands =
          -b html releasenotes/source releasenotes/build/html
 
 [testenv:functional]
+basepython = python3
 setenv =
   {[testenv]setenv}
   OS_TEST_PATH = ./manilaclient/tests/functional