Updated berkshelf to 3.1.5

Updated berkshelf from 2.0.18 to 3.1.5 in Gemfile and added supermarket
source to Berksfile. Also removed sysctl from berksfile since it was
already removed from metadata in 7.0.2 and is not needed anymore.

Change-Id: I8bc2164f742df808f4f6b0f13b6bc566fafdbde3
Implements: blueprint update-berkshelf

Berksfile

@@ -1,12 +1,12 @@
+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"
 cookbook "openstack-network",
-  git: "git://github.com/stackforge/cookbook-openstack-network.git"
-cookbook "sysctl",
-  git: "git://github.com/Fewbytes/sysctl-cookbook.git"
+  github: "stackforge/cookbook-openstack-network"

CHANGELOG.md

@@ -5,6 +5,7 @@ This file is used to list changes made in each version of cookbook-openstack-com
 ## 10.0.0
 * Upgrading to Juno
 * Sync conf files with Juno
+* Upgrading berkshelf from 2.0.18 to 3.1.5
 
 ## 9.3.1
 * Move auth configuration from api-paste.ini to nova.conf

Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'chef', '~> 11.12.0'
 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

@@ -11,7 +11,7 @@ To run all of the tests with Strainer:
 Or you may run the tests individually:
 
     $ 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  ##