]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
buildpackages: silently ignore IPv6 addresses
authorLoic Dachary <ldachary@redhat.com>
Wed, 4 Nov 2015 10:52:24 +0000 (11:52 +0100)
committerLoic Dachary <ldachary@redhat.com>
Wed, 4 Nov 2015 12:26:34 +0000 (13:26 +0100)
Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit 7b8f205952d5e49609efbd77a1becae3aff4e531)

tasks/buildpackages/Makefile

index 3e93c1774272205ddd5b7f3328782b3d841d2c1e..df808cb4f2d85161e298c1ee9a04e96fc53caef7 100644 (file)
@@ -3,7 +3,7 @@ D=/tmp/stampsdir
 VPATH=${D}
 
 define get_ip
-$$(openstack server show -f json $(1) | jq '.[] | select(.Field == "addresses") | .Value' | perl -pe 's/.*?=([\d\.]+).*/$$1/')
+$$(openstack server show -f json $(1) | jq '.[] | select(.Field == "addresses") | .Value' | perl -pe 's/([\da-f]*:){7}[\da-f]*, //; s/.*?=([\d\.]+).*/$$1/')
 endef
 
 MY_IP=$(shell hostname -I | cut -f1 -d' ')