Merge "Fix bootstrap.sh" into stable/kilo

This commit is contained in:
Jenkins 2016-03-17 15:19:22 +00:00 committed by Gerrit Code Review
commit 99c7d57d67
1 changed files with 2 additions and 5 deletions

View File

@ -2,11 +2,8 @@
## This script is for installing all the needed packages on trusty to run the chef tests with 'chef exec rake'. ## 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. ## 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 \ wget -nv -t 3 -O common-bootstrap.sh https://raw.githubusercontent.com/openstack/cookbook-openstack-common/stable/kilo/bootstrap.sh
--retry 3 \ /bin/bash -x common-bootstrap.sh
--silent \
--show-error \
| /bin/bash -x
# To enable cookbook Depends-On support, the Common bootstrap above will already # To enable cookbook Depends-On support, the Common bootstrap above will already
# get the cookbook dependencies cloned into ../openstack-cookbook-xxxx. In order to # get the cookbook dependencies cloned into ../openstack-cookbook-xxxx. In order to