From 83facf36a605af27d28caa82cb660a1be9a0df39 Mon Sep 17 00:00:00 2001
From: galstrom21 <jshepher@rackspace.com>
Date: Tue, 29 Jul 2014 11:27:41 -0500
Subject: [PATCH] Setting up repo for master Juno Branch

* Update metadata version
* Removing Strainer file
* Adding Gemfile.lock to .gitignore
* Updating Gems
  * chef (11.12.0)
  * chefspec (4.0.0)
  * rspec (3.0.0)

Change-Id: I5eb3a68694647617a970e7960d56b2f59c2f53e1
Partial-Bug: 1349865
---
 .gitignore   |  1 +
 CHANGELOG.md |  3 +++
 Gemfile      |  7 +++----
 Strainerfile |  5 -----
 metadata.rb  | 10 +++++-----
 5 files changed, 12 insertions(+), 14 deletions(-)
 delete mode 100644 Strainerfile

diff --git a/.gitignore b/.gitignore
index 6588c1fd..6fd9550b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@
 .coverage/
 *.swp
 Berksfile.lock
+Gemfile.lock
 Vagrantfile
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 989a001e..02b38b96 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 This file is used to list changes made in each version of cookbook-openstack-compute.
 
+## 10.0.0
+* Upgrading to Juno
+
 ## 9.3.1
 * Move auth configuration from api-paste.ini to nova.conf
 * fix fauxhai version for suse and redhat
diff --git a/Gemfile b/Gemfile
index 33c49e73..805fb0cd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,12 +1,11 @@
 source 'https://rubygems.org'
 
-gem 'chef', '~> 11.8'
+gem 'chef', '~> 11.12.0'
 gem 'json', '<= 1.7.7' # chef 11 dependency
 gem 'berkshelf', '~> 2.0.18'
 gem 'hashie', '~> 2.0'
-gem 'chefspec', '~> 3.4.0'
-gem 'rspec', '~> 2.14.1'
+gem 'chefspec', '~> 4.0.0'
+gem 'rspec', '~> 3.0.0'
 gem 'foodcritic', '~> 3.0.3'
-gem 'strainer'
 gem 'rubocop', '~> 0.18.1'
 gem 'fauxhai', '>= 2.1.0'
diff --git a/Strainerfile b/Strainerfile
deleted file mode 100644
index 1c9a3e06..00000000
--- a/Strainerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-# Strainerfile
-rubocop: rubocop $SANDBOX/$COOKBOOK
-knife test: knife cookbook test $COOKBOOK
-foodcritic: foodcritic -f any -t ~FC003 -t ~FC023 $SANDBOX/$COOKBOOK
-chefspec: rspec --format documentation $SANDBOX/$COOKBOOK/spec
diff --git a/metadata.rb b/metadata.rb
index 08e14d70..279c857b 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -4,7 +4,7 @@ maintainer_email 'matt@opscode.com'
 license          'Apache 2.0'
 description      'The OpenStack Compute service Nova.'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '9.3.1'
+version          '10.0.0'
 
 recipe 'openstack-compute::api-ec2', 'Installs AWS EC2 compatible API'
 recipe 'openstack-compute::api-metadata', 'Installs the nova metadata package'
@@ -25,9 +25,9 @@ recipe 'openstack-compute::vncproxy', 'Installs and configures the vncproxy serv
   supports os
 end
 
-depends 'openstack-common', '~> 9.5'
-depends 'openstack-identity', '~> 9.0'
-depends 'openstack-image', '~> 9.0'
-depends 'openstack-network', '~> 9.0'
+depends 'openstack-common', '~> 10.0'
+depends 'openstack-identity', '~> 10.0'
+depends 'openstack-image', '~> 10.0'
+depends 'openstack-network', '~> 10.0'
 depends 'selinux', '~> 0.7'
 depends 'python', '~> 1.4.6'