From: Loic Dachary <ldachary@redhat.com>
Date: Tue, 3 Nov 2015 20:46:46 +0000 (+0100)
Subject: openstack: only consider IPv4 subnets
X-Git-Tag: 1.1.0~747^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1a51e290f74dc76db9e6695c9d59e8432d0ea4f0;p=teuthology.git

openstack: only consider IPv4 subnets

Signed-off-by: Loic Dachary <ldachary@redhat.com>
---

diff --git a/teuthology/openstack/setup-openstack.sh b/teuthology/openstack/setup-openstack.sh
index 2dceb6a7a..7c24ed0d0 100755
--- a/teuthology/openstack/setup-openstack.sh
+++ b/teuthology/openstack/setup-openstack.sh
@@ -528,7 +528,7 @@ function main() {
 
     local provider=$(verify_openstack)
 
-    eval local default_subnet=$(neutron subnet-list -f json | jq '.[0].cidr')
+    eval local default_subnet=$(neutron subnet-list -f json -c cidr -c ip_version | jq '.[] | select(.ip_version == 4) | .cidr')
     if test -z "$default_subnet" ; then
         default_subnet=$(nova tenant-network-list | grep / | cut -f6 -d' ' | head -1)
     fi