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: I3afbf5f0d411a4b81bc751f23ebad0ae099341fe
Partial-Bug: 1349865
This commit is contained in:
galstrom21 2014-07-29 11:36:40 -05:00
parent c52a798e48
commit c9f8ffd4da
5 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

@ -2,6 +2,9 @@ openstack-telemetry Cookbook CHANGELG
==============================
This file is used to list changes made in each version of the openstack-metering cookbook.
## 10.0.0
* Upgrading to Juno
## 9.3.0
* python_packages database client attributes have been migrated to
the -common cookbook

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

@ -4,7 +4,7 @@ maintainer_email 'cookbooks@lists.tfoundry.com'
license 'Apache 2.0'
description 'The OpenStack Metering service Ceilometer.'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '9.3.0'
version '10.0.0'
recipe 'openstack-telemetry::agent-central', 'Installs agent central service.'
recipe 'openstack-telemetry::agent-compute', 'Installs agent compute service.'
@ -21,6 +21,6 @@ recipe 'openstack-telemetry::identity_registration', 'Registers the endpoints, t
supports os
end
depends 'openstack-common', '~> 9.5'
depends 'openstack-identity', '~> 9.0'
depends 'openstack-compute', '~> 9.0'
depends 'openstack-common', '~> 10.0'
depends 'openstack-identity', '~> 10.0'
depends 'openstack-compute', '~> 10.0'