stable/queens release patch
Change-Id: I515f4ef9a5ecdea9557e6f7feb1a38bcda6e6c4f
This commit is contained in:
parent
2fd2b86adb
commit
e0970172e9
|
@ -2,3 +2,4 @@
|
||||||
host=review.openstack.org
|
host=review.openstack.org
|
||||||
port=29418
|
port=29418
|
||||||
project=openstack/cookbook-openstack-ops-database.git
|
project=openstack/cookbook-openstack-ops-database.git
|
||||||
|
defaultbranch=stable/queens
|
||||||
|
|
10
Berksfile
10
Berksfile
|
@ -1,11 +1,9 @@
|
||||||
source 'https://supermarket.chef.io'
|
source 'https://supermarket.chef.io'
|
||||||
|
|
||||||
%w(common).each do |cookbook|
|
if Dir.exist?("../cookbook-openstack-common")
|
||||||
if Dir.exist?("../cookbook-openstack-#{cookbook}")
|
cookbook "openstack-common", path: "../cookbook-openstack-common"
|
||||||
cookbook "openstack-#{cookbook}", path: "../cookbook-openstack-#{cookbook}"
|
else
|
||||||
else
|
cookbook "openstack-common", git: "https://git.openstack.org/openstack/cookbook-openstack-common", branch: 'stable/queens'
|
||||||
cookbook "openstack-#{cookbook}", git: "https://git.openstack.org/openstack/cookbook-openstack-#{cookbook}"
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
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/queens/bootstrap.sh \
|
||||||
--retry 3 \
|
--retry 3 \
|
||||||
--silent \
|
--silent \
|
||||||
--show-error \
|
--show-error \
|
||||||
|
|
Loading…
Reference in New Issue