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: If0a375f050f1840256565e1af208a9eeb4c42f1c
Partial-Bug: 1349865
This commit is contained in:
galstrom21 2014-07-29 11:21:39 -05:00
parent bd894d5a59
commit 5ce168c499
5 changed files with 10 additions and 12 deletions

1
.gitignore vendored
View File

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

View File

@ -2,6 +2,9 @@
This file is used to list changes made in each version of cookbook-openstack-image.
## 10.0.0
* Upgrading to Juno
## 9.2.0
* python_packages database client attributes have been migrated to the -common cookbook
* bump berkshelf to 2.0.18 to allow Supermarket support

View File

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

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

@ -3,7 +3,7 @@ maintainer 'Opscode, Inc.'
license 'Apache 2.0'
description 'Installs and configures the Glance Image Registry and Delivery Service'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '9.2.0'
version '10.0.0'
recipe 'openstack-image::api', 'Installs packages required for a glance api server'
recipe 'openstack-image::client', 'Install packages required for glance client'
recipe 'openstack-image::registry', 'Installs packages required for a glance registry server'
@ -14,5 +14,5 @@ recipe 'openstack-image::image_upload', 'Upload image using glance im
supports os
end
depends 'openstack-common', '~> 9.5'
depends 'openstack-identity', '~> 9.0'
depends 'openstack-common', '~> 10.0'
depends 'openstack-identity', '~> 10.0'