From 4756dc37f70cb1b2cea6d33c422572e83bcfd2d8 Mon Sep 17 00:00:00 2001
From: Samuel Cassiba <s@cassiba.com>
Date: Thu, 26 Jul 2018 20:37:21 -0700
Subject: [PATCH] stable/queens release patch

Change-Id: I1fdd4b532b672da66a99e0d1d8367b975f371f95
---
 .gitreview   | 1 +
 Berksfile    | 7 +++++--
 bootstrap.sh | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitreview b/.gitreview
index 657f1c7..0dd22c6 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=review.openstack.org
 port=29418
 project=openstack/cookbook-openstack-image.git
+defaultbranch=stable/queens
diff --git a/Berksfile b/Berksfile
index 9f53c79..6dc3322 100644
--- a/Berksfile
+++ b/Berksfile
@@ -8,7 +8,10 @@ source 'https://supermarket.chef.io'
   end
 end
 
-cookbook 'openstackclient',
-  github: 'cloudbau/cookbook-openstackclient'
+if Dir.exist?('../cookbook-openstackclient')
+  cookbook 'openstackclient', path: '../cookbook-openstackclient'
+else
+  cookbook 'openstackclient', git: 'https://git.openstack.org/openstack/cookbook-openstackclient', branch: 'stable/queens'
+end
 
 metadata
diff --git a/bootstrap.sh b/bootstrap.sh
index 41bbec7..7d17fb3 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -2,5 +2,5 @@
 ## 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.
 
-wget -nv -t 3 -O common-bootstrap.sh https://raw.githubusercontent.com/openstack/cookbook-openstack-common/master/bootstrap.sh
+wget -nv -t 3 -O common-bootstrap.sh https://raw.githubusercontent.com/openstack/cookbook-openstack-common/stable/queens/bootstrap.sh
 /bin/bash -x common-bootstrap.sh