From c109a9d8c62c52160f0665ec3d13a3cee35da32b Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Mon, 22 Aug 2016 18:20:05 +0200 Subject: [PATCH] openstack: do not use cached tokens for neutron Signed-off-by: Loic Dachary --- teuthology/openstack/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/teuthology/openstack/__init__.py b/teuthology/openstack/__init__.py index 66d8ffda0..5d7164b76 100644 --- a/teuthology/openstack/__init__.py +++ b/teuthology/openstack/__init__.py @@ -112,14 +112,16 @@ class OpenStackInstance(object): self.set_info() def get_ip_neutron(self): - subnets = json.loads(misc.sh("neutron subnet-list -f json -c id -c ip_version")) + subnets = json.loads(misc.sh("unset OS_AUTH_TYPE OS_TOKEN ; " + "neutron subnet-list -f json -c id -c ip_version")) subnet_ids = [] for subnet in subnets: if subnet['ip_version'] == 4: subnet_ids.append(subnet['id']) if not subnet_ids: raise Exception("no subnet with ip_version == 4") - ports = json.loads(misc.sh("neutron port-list -f json -c fixed_ips -c device_id")) + ports = json.loads(misc.sh("unset OS_AUTH_TYPE OS_TOKEN ; " + "neutron port-list -f json -c fixed_ips -c device_id")) fixed_ips = None for port in ports: if port['device_id'] == self['id']: -- 2.47.3