Merge "Updated berkshelf to 3.1.5"

Berksfile

@@ -1,4 +1,8 @@
+source "https://supermarket.getchef.com"
+
 metadata
 
-cookbook 'openstack-identity',  :git => 'https://github.com/stackforge/cookbook-openstack-identity.git'
-cookbook 'openstack-common',    :git => 'https://github.com/stackforge/cookbook-openstack-common.git'
+cookbook 'openstack-identity',
+  github: 'stackforge/cookbook-openstack-identity'
+cookbook 'openstack-common',
+  github: 'stackforge/cookbook-openstack-common'

CHANGELOG.md

@@ -7,6 +7,7 @@ This file is used to list changes made in each version of cookbook-openstack-net
 ## 10.0.0
 * Upgrading to Juno
 * Sync conf files with Juno
+* Upgrading berkshelf from 2.0.18 to 3.1.5
 
 ## 9.1.1
 * Allow dhcp_delete_namespaces and router_dhcp_namespaces to be overridden.

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 folder .cookbooks
     $ bundle exec strainer test -s Strainerfile # run tests
 
 ## Rubocop  ##