From 92f35526da721a4c4f0bf7205ea1c12c5edd5a8a Mon Sep 17 00:00:00 2001
From: Jan Klare <j.klare@x-ion.de>
Date: Tue, 10 Nov 2015 11:24:44 +0100
Subject: [PATCH] stable/liberty release patch

Change-Id: Ied004536ac9ec38c21ed701f7e97b56758812a89
---
 .gitignore     |  1 -
 .gitreview     |  1 +
 Berksfile.lock | 18 ++++++++++++++++++
 bootstrap.sh   |  2 +-
 4 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 Berksfile.lock

diff --git a/.gitignore b/.gitignore
index b26909d..adc7486 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@ berks-cookbooks/
 .vagrant
 .coverage/
 *.swp
-Berksfile.lock
 Vagrantfile
 Gemfile.lock
 local-mode-cache
diff --git a/.gitreview b/.gitreview
index b525a43..9ce880d 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=review.openstack.org
 port=29418
 project=openstack/cookbook-openstack-client.git
+defaultbranch=stable/liberty
diff --git a/Berksfile.lock b/Berksfile.lock
new file mode 100644
index 0000000..8e5af92
--- /dev/null
+++ b/Berksfile.lock
@@ -0,0 +1,18 @@
+DEPENDENCIES
+  openstack_client
+    path: .
+    metadata: true
+
+GRAPH
+  apt (2.9.2)
+  build-essential (2.1.3)
+  chef-sugar (3.1.1)
+  openstack_client (12.0.0)
+    apt (~> 2.8)
+    build-essential (~> 2.1.3)
+    xml (~> 1.2.13)
+    yum (~> 3.5.4)
+  xml (1.2.13)
+    build-essential (>= 0.0.0)
+    chef-sugar (>= 0.0.0)
+  yum (3.5.4)
diff --git a/bootstrap.sh b/bootstrap.sh
index fe49ef2..3e2ef9e 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/liberty/bootstrap.sh \
   --retry 3 \
   --silent \
   --show-error \