From bf0351a03cb4ce43c8836b35bc9900bbcc7214d9 Mon Sep 17 00:00:00 2001 From: Mark Vanderwiel Date: Thu, 27 Aug 2015 15:35:35 -0500 Subject: [PATCH] Kilo stable branch changes Change-Id: I8160b4d45503e1f1a91d7e6fc735f878a92a7de8 Partial-Bug: #1489582 --- .gitreview | 2 ++ Berksfile | 4 +++- bootstrap.sh | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitreview b/.gitreview index efc710b..3429c41 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,5 @@ host=review.openstack.org port=29418 project=openstack/cookbook-openstack-ops-database.git +defaultbranch=stable/kilo + diff --git a/Berksfile b/Berksfile index 50da25e..bd255ab 100644 --- a/Berksfile +++ b/Berksfile @@ -3,4 +3,6 @@ source "https://supermarket.chef.io" metadata cookbook "openstack-common", - github: "openstack/cookbook-openstack-common" + github: "openstack/cookbook-openstack-common", + branch: "stable/kilo" + diff --git a/bootstrap.sh b/bootstrap.sh index fe49ef2..59db730 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -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 \