]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
openstack: only consider IPv4 subnets 696/head
authorLoic Dachary <ldachary@redhat.com>
Tue, 3 Nov 2015 20:46:46 +0000 (21:46 +0100)
committerLoic Dachary <ldachary@redhat.com>
Mon, 16 Nov 2015 10:42:45 +0000 (11:42 +0100)
Signed-off-by: Loic Dachary <ldachary@redhat.com>
teuthology/openstack/setup-openstack.sh

index 2dceb6a7a1c9e0ea3dba31184a69de973dc61892..7c24ed0d05689c16b9c5a20bc043c30a20fcd9be 100755 (executable)
@@ -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