Merge "stable/pike release" into stable/pike

.gitignore

@@ -4,6 +4,6 @@ berks-cookbooks/
 .vagrant
 .coverage/
 *.swp
-Berksfile.lock
 Vagrantfile
 Gemfile.lock
+Berksfile.lock

.gitreview

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

Berksfile

@@ -4,11 +4,13 @@ source 'https://supermarket.chef.io'
   if Dir.exist?("../cookbook-openstack-#{cookbook}")
     cookbook "openstack-#{cookbook}", path: "../cookbook-openstack-#{cookbook}"
   else
-    cookbook "openstack-#{cookbook}", github: "openstack/cookbook-openstack-#{cookbook}"
+    cookbook "openstack-#{cookbook}", github: "openstack/cookbook-openstack-#{cookbook}",
+                                      branch: 'stable/pike'
   end
 end
 
 cookbook 'openstackclient',
-  github: 'cloudbau/cookbook-openstackclient'
+  github: 'cloudbau/cookbook-openstackclient',
+  branch: 'stable/pike'
 
 metadata

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/pike/bootstrap.sh \
   --retry 3 \
   --silent \
   --show-error \