Merge "stable/pike release" into stable/pike
This commit is contained in:
commit
b2298a6000
|
@ -4,6 +4,6 @@ berks-cookbooks/
|
||||||
.vagrant
|
.vagrant
|
||||||
.coverage/
|
.coverage/
|
||||||
*.swp
|
*.swp
|
||||||
Berksfile.lock
|
|
||||||
Vagrantfile
|
Vagrantfile
|
||||||
Gemfile.lock
|
Gemfile.lock
|
||||||
|
Berksfile.lock
|
||||||
|
|
|
@ -2,3 +2,4 @@
|
||||||
host=review.openstack.org
|
host=review.openstack.org
|
||||||
port=29418
|
port=29418
|
||||||
project=openstack/cookbook-openstack-integration-test.git
|
project=openstack/cookbook-openstack-integration-test.git
|
||||||
|
defaultbranch=stable/pike
|
||||||
|
|
|
@ -4,11 +4,13 @@ source 'https://supermarket.chef.io'
|
||||||
if Dir.exist?("../cookbook-openstack-#{cookbook}")
|
if Dir.exist?("../cookbook-openstack-#{cookbook}")
|
||||||
cookbook "openstack-#{cookbook}", path: "../cookbook-openstack-#{cookbook}"
|
cookbook "openstack-#{cookbook}", path: "../cookbook-openstack-#{cookbook}"
|
||||||
else
|
else
|
||||||
cookbook "openstack-#{cookbook}", github: "openstack/cookbook-openstack-#{cookbook}"
|
cookbook "openstack-#{cookbook}", github: "openstack/cookbook-openstack-#{cookbook}",
|
||||||
|
branch: 'stable/pike'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
cookbook 'openstackclient',
|
cookbook 'openstackclient',
|
||||||
github: 'cloudbau/cookbook-openstackclient'
|
github: 'cloudbau/cookbook-openstackclient',
|
||||||
|
branch: 'stable/pike'
|
||||||
|
|
||||||
metadata
|
metadata
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
## 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/master/bootstrap.sh \
|
curl https://raw.githubusercontent.com/openstack/cookbook-openstack-common/stable/pike/bootstrap.sh \
|
||||||
--retry 3 \
|
--retry 3 \
|
||||||
--silent \
|
--silent \
|
||||||
--show-error \
|
--show-error \
|
||||||
|
|
Loading…
Reference in New Issue