From d3341296961b04cb7a2ba54a5dcb30f7364a6ae1 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Tue, 4 Sep 2018 11:18:08 +0200 Subject: Protect vs OS_ENDPOINT_TYPE in shaker MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Else a conflict can occur between OS_INTERFACE and OS_ENDPOINT_TYPE. Change-Id: I3e0237857f95e506706fb852889308ea82e41e84 Signed-off-by: Cédric Ollivier --- functest/opnfv_tests/openstack/shaker/shaker.py | 1 + 1 file changed, 1 insertion(+) diff --git a/functest/opnfv_tests/openstack/shaker/shaker.py b/functest/opnfv_tests/openstack/shaker/shaker.py index c005df055..1170fede3 100644 --- a/functest/opnfv_tests/openstack/shaker/shaker.py +++ b/functest/opnfv_tests/openstack/shaker/shaker.py @@ -88,6 +88,7 @@ class Shaker(singlevm.SingleVm2): 'export OS_PROJECT_ID={} && ' 'unset OS_TENANT_NAME && ' 'unset OS_TENANT_ID && ' + 'unset OS_ENDPOINT_TYPE && ' 'export OS_PASSWORD={} && ' '{}' 'env && ' -- cgit 1.2.3-korg