stable/queens release patch

Change-Id: I5f00d9efb60adff2f030d7604dfb9ff91539f975

Berksfile

@@ -1,10 +1,17 @@
 source 'https://supermarket.chef.io'
 
-metadata
+%w(common identity).each do |cookbook|
+  if Dir.exist?("../cookbook-openstack-#{cookbook}")
+    cookbook "openstack-#{cookbook}", path: "../cookbook-openstack-#{cookbook}"
+  else
+    cookbook "openstack-#{cookbook}", git: "https://git.openstack.org/openstack/cookbook-openstack-#{cookbook}", branch: 'stable/queens'
+  end
+end
 
-cookbook 'openstack-identity',
-  github: 'openstack/cookbook-openstack-identity'
-cookbook 'openstack-common',
-  github: 'openstack/cookbook-openstack-common'
-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

bootstrap.sh

@@ -2,7 +2,7 @@
 ## This script is for installing all the needed packages on xenial 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/queens/bootstrap.sh \
   --retry 3 \
   --silent \
   --show-error \