From 14d6388368237e590816501912fc5d1d36e08891 Mon Sep 17 00:00:00 2001 From: Jan Klare Date: Wed, 16 Mar 2016 08:51:36 +0100 Subject: [PATCH] Fix bootstrap.sh On recent test machines, curl isn't available anymore, so use wget instead. Piping directly into bash isn't that great anyway. Change-Id: I98612a5810555f37d3b3f1260e4f33837f979941 --- bootstrap.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index d01ae2c..089ee06 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -2,11 +2,8 @@ ## This script is for installing all the needed packages on trusty to run the chef tests with 'chef exec rake'. ## It relies on the common bootstrap.sh from openstack/cookbook-openstack-common for installing common dependencies. -curl https://raw.githubusercontent.com/openstack/cookbook-openstack-common/stable/kilo/bootstrap.sh \ - --retry 3 \ - --silent \ - --show-error \ - | /bin/bash -x +wget -nv -t 3 -O common-bootstrap.sh https://raw.githubusercontent.com/openstack/cookbook-openstack-common/stable/kilo/bootstrap.sh +/bin/bash -x common-bootstrap.sh # To enable cookbook Depends-On support, the Common bootstrap above will already # get the cookbook dependencies cloned into ../openstack-cookbook-xxxx. In order to