Kilo stable branch changes

Change-Id: I34927f50be4345cbaa4a2ab65dac2ba65e2e384f
Partial-Bug: #1489582
This commit is contained in:
Mark Vanderwiel 2015-08-27 15:31:19 -05:00
parent af0763c67f
commit 62b802623b
3 changed files with 18 additions and 8 deletions

View File

@ -2,3 +2,5 @@
host=review.openstack.org
port=29418
project=openstack/cookbook-openstack-integration-test.git
defaultbranch=stable/kilo

View File

@ -3,16 +3,24 @@ source 'https://supermarket.chef.io'
metadata
cookbook "openstack-bare-metal",
github: "openstack/cookbook-openstack-bare-metal"
github: "openstack/cookbook-openstack-bare-metal",
branch: "stable/kilo"
cookbook "openstack-common",
github: "openstack/cookbook-openstack-common"
github: "openstack/cookbook-openstack-common",
branch: "stable/kilo"
cookbook "openstack-identity",
github: "openstack/cookbook-openstack-identity"
github: "openstack/cookbook-openstack-identity",
branch: "stable/kilo"
cookbook "openstack-image",
github: "openstack/cookbook-openstack-image"
github: "openstack/cookbook-openstack-image",
branch: "stable/kilo"
cookbook "openstack-compute",
github: "openstack/cookbook-openstack-compute"
github: "openstack/cookbook-openstack-compute",
branch: "stable/kilo"
cookbook "openstack-network",
github: "openstack/cookbook-openstack-network"
github: "openstack/cookbook-openstack-network",
branch: "stable/kilo"
cookbook "openstack-block-storage",
github: "openstack/cookbook-openstack-block-storage"
github: "openstack/cookbook-openstack-block-storage",
branch: "stable/kilo"

View File

@ -2,7 +2,7 @@
## 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/master/bootstrap.sh \
curl https://raw.githubusercontent.com/openstack/cookbook-openstack-common/stable/kilo/bootstrap.sh \
--retry 3 \
--silent \
--show-error \