From de25e0669c642839add099b81c9e36a7f99af7b0 Mon Sep 17 00:00:00 2001
From: Jan Klare <j.klare@x-ion.de>
Date: Fri, 15 Aug 2014 10:15:45 +0200
Subject: [PATCH] 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: Ic3bfec5014340b270266c3d49e53499c3b1e1b72
Implements: blueprint update-berkshelf
---
 Berksfile    | 4 +++-
 CHANGELOG.md | 1 +
 Gemfile      | 2 +-
 TESTING.md   | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Berksfile b/Berksfile
index 84e5b6d..cb32219 100644
--- a/Berksfile
+++ b/Berksfile
@@ -1,4 +1,6 @@
+source "https://supermarket.getchef.com"
+
 metadata
 
 cookbook "openstack-common",
-  git: "git://github.com/stackforge/cookbook-openstack-common.git"
+  github: "stackforge/cookbook-openstack-common"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1bb7e53..44813ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ This file is used to list changes made in each version of the openstack-ops-data
 
 ## 10.0.0
 * Upgrading to Juno
+* Upgrading berkshelf from 2.0.18 to 3.1.5
 
 ## 9.2.0
 * Update database and mysql dependency
diff --git a/Gemfile b/Gemfile
index 867b07b..e16cf65 100644
--- a/Gemfile
+++ b/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'
diff --git a/TESTING.md b/TESTING.md
index 2b52f68..1ed6680 100644
--- a/TESTING.md
+++ b/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  ##