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
This commit is contained in:
galstrom21 2014-07-29 11:31:54 -05:00
parent cedf3540cf
commit 6eebbbabff
6 changed files with 11 additions and 13 deletions

1
.gitignore vendored
View File

@ -5,4 +5,5 @@
.coverage/
*.swp
Berksfile.lock
Gemfile.lock
Vagrantfile

View File

@ -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

View File

@ -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'

View File

@ -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

View File

@ -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'

View File

@ -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