From 6eebbbabffe403d7b5e855399d36a5cf4cc0a729 Mon Sep 17 00:00:00 2001
From: galstrom21 <jshepher@rackspace.com>
Date: Tue, 29 Jul 2014 11:31:54 -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: I136897badca86f30733a6752d393e4b8748cc47b
Partial-Bug: 1349865
---
 .gitignore          | 1 +
 CHANGELOG.md        | 3 +++
 Gemfile             | 7 +++----
 Strainerfile        | 5 -----
 metadata.rb         | 6 +++---
 spec/server_spec.rb | 2 +-
 6 files changed, 11 insertions(+), 13 deletions(-)
 delete mode 100644 Strainerfile

diff --git a/.gitignore b/.gitignore
index be9fe715..86d83739 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 aeb8aaa5..5d6e7e77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # CHANGELOG for cookbook-openstack-network
 This file is used to list changes made in each version of cookbook-openstack-network.
 
+## 10.0.0
+* Upgrading to Juno
+
 ## 9.1.1
 * Allow dhcp_delete_namespaces and router_dhcp_namespaces to be overridden.
 * Add support for openvswitch agent MTU size of veth interfaces
diff --git a/Gemfile b/Gemfile
index eeb359d6..867b07bd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,11 +1,10 @@
 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'
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 e07eddc4..47e45048 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -5,7 +5,7 @@ maintainer        'Jay Pipes <jaypipes@gmail.com>'
 license           'Apache 2.0'
 description       'Installs and configures the OpenStack Network API Service and various agents and plugins'
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version           '9.1.1'
+version           '10.0.0'
 recipe            'openstack-network::client', 'Install packages required for network client'
 recipe            'openstack-network::server', 'Installs packages required for a OpenStack Network server'
 recipe            'openstack-network::openvswitch', 'Installs packages required for OVS'
@@ -16,5 +16,5 @@ recipe            'openstack-network::identity_registration', 'Registers OpenSta
   supports os
 end
 
-depends           'openstack-identity', '~> 9.0'
-depends           'openstack-common', '~> 9.5'
+depends           'openstack-identity', '~> 10.0'
+depends           'openstack-common', '~> 10.0'
diff --git a/spec/server_spec.rb b/spec/server_spec.rb
index 7f5c6a26..3186b218 100644
--- a/spec/server_spec.rb
+++ b/spec/server_spec.rb
@@ -15,7 +15,7 @@ describe 'openstack-network::server' do
     include_context 'neutron-stubs'
 
     it 'uses release db stamp' do
-      expect(chef_run).to run_bash('migrate network database').with_code(/stamp icehouse/)
+      expect(chef_run).to run_bash('migrate network database').with_code(/stamp juno/)
     end
 
     it 'does not install neutron-server when nova networking' do