From b0be7e7e67d36a5585d98e008e7359a39476b7dc Mon Sep 17 00:00:00 2001
From: Mark Vanderwiel <vanderwl@us.ibm.com>
Date: Thu, 27 Aug 2015 15:38:44 -0500
Subject: [PATCH] Kilo stable branch changes

Change-Id: Ia86ed779981a2d71217a806b1f4d2da4ecce8f2e
Partial-Bug: #1489582
---
 .gitreview   |  2 ++
 Berksfile    | 19 +++++++++++++------
 bootstrap.sh |  2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/.gitreview b/.gitreview
index 96c0f45..6b145af 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,5 @@
 host=review.openstack.org
 port=29418
 project=openstack/cookbook-openstack-telemetry.git
+defaultbranch=stable/kilo
+
diff --git a/Berksfile b/Berksfile
index 4854546..a756a76 100644
--- a/Berksfile
+++ b/Berksfile
@@ -3,14 +3,21 @@ 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-compute",
-  github: "openstack/cookbook-openstack-compute"
+  github: "openstack/cookbook-openstack-compute",
+  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-network",
-  github: "openstack/cookbook-openstack-network"
+  github: "openstack/cookbook-openstack-network",
+  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 \