Updated berkshelf to 3.1.5

Updated berkshelf from 2.0.18 to 3.1.5 in Gemfile and added supermarket
source to Berksfile

Change-Id: I76a16fb6fb9fd4743027fb22403eacbda09647ce
Implements: blueprint update-berkshelf

Berksfile

@@ -1,8 +1,10 @@
+source "https://supermarket.getchef.com"
+
 metadata
 
 cookbook "openstack-image",
-  git: "git://github.com/stackforge/cookbook-openstack-image.git"
+  github: "stackforge/cookbook-openstack-image"
 cookbook "openstack-identity",
-  git: "git://github.com/stackforge/cookbook-openstack-identity.git"
+  github: "stackforge/cookbook-openstack-identity"
 cookbook "openstack-common",
-  git: "git://github.com/stackforge/cookbook-openstack-common.git"
+  github: "stackforge/cookbook-openstack-common"

CHANGELOG.md

@@ -5,6 +5,7 @@ This file is used to list changes made in each version of the openstack-block-st
 ## 10.0.0
 * Upgrading to Juno
 * Sync conf files with Juno
+* Upgrading berkshelf from 2.0.18 to 3.1.5
 
 ## 9.4.1
 * Add support for LVMISCSIDriver driver using block devices with LVM

Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 
 gem 'chef', '~> 11.12'
 gem 'json', '<= 1.7.7' # chef 11 dependency
-gem 'berkshelf', '~> 2.0.18'
+gem 'berkshelf', '~> 3.1.5'
 gem 'hashie', '~> 2.0'
 gem 'chefspec', '~> 4.0.0'
 gem 'rspec', '~> 3.0.0'

TESTING.md

@@ -7,7 +7,7 @@ Tests are defined in [Strainerfile](Strainerfile), which in turn calls rubocop,
 To run the tests:
 
     $ bundle install --path=.bundle # install gem dependencies
-    $ bundle exec berks install --path=.cookbooks # install cookbook dependencies
+    $ bundle exec berks vendor .cookbooks # install cookbook dependencies and create the folder .cookbooks
     $ bundle exec strainer test -s Strainerfile # run tests
 
 ## Rubocop  ##