stable/queens release patch

Change-Id: I646f9c88c0a7982ffe67c5e2082f71acd21f37ae

.gitreview

@@ -2,3 +2,4 @@
 host=review.openstack.org
 port=29418
 project=openstack/cookbook-openstack-identity.git
+defaultbranch=stable/queens

Berksfile

@@ -1,9 +1,15 @@
 source 'https://supermarket.chef.io'
 
+if Dir.exist?('../cookbook-openstack-common')
+  cookbook 'openstack-common', path: '../cookbook-openstack-#{cookbook}'
+else
+  cookbook 'openstack-common', git: 'https://git.openstack.org/openstack/cookbook-openstack-common', branch: 'stable/queens'
+end
+
+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
-
-cookbook 'openstack-common',
-  git: 'https://git.openstack.org/openstack/cookbook-openstack-common'
-
-cookbook 'openstackclient',
-  github: 'cloudbau/cookbook-openstackclient'

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