Style and lint fixes to support newer ChefDK

Change-Id: I9c105163c4425ca53eb26d09e42d6efced43bf6a
Depends-On: I6ce4587caa3ae68ddbd3ef1a521aaf46f4840b2c
This commit is contained in:
Samuel Cassiba 2016-07-06 13:38:35 -07:00
parent ddbab534e0
commit 00942d8d8d
3 changed files with 8 additions and 6 deletions

View File

@ -12,8 +12,8 @@ Requirements
============
- Chef 12 or higher
- chefdk 0.9.0 for testing (also includes berkshelf for cookbook dependency
resolution)
- chefdk 0.9.0 or higher for testing (also includes berkshelf for cookbook
dependency resolution)
WARNING:
- Currently there are no gnocchi packages included for Ubuntu Trusty. The
@ -31,8 +31,8 @@ Cookbooks
The following cookbooks are dependencies:
- 'openstack-common', '>= 13.0.0'
- 'openstack-identity', '>= 13.0.0'
- 'openstack-common', '>= 14.0.0'
- 'openstack-identity', '>= 14.0.0'
Attributes
==========

View File

@ -1,6 +1,8 @@
name 'openstack-telemetry'
maintainer 'openstack-chef'
maintainer_email 'openstack-dev@lists.openstack.org'
issues_url 'https://launchpad.net/openstack-chef' if respond_to?(:issues_url)
source_url 'https://github.com/openstack/cookbook-openstack-telemetry' if respond_to?(:source_url)
license 'Apache 2.0'
description 'The OpenStack Metering service Ceilometer.'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))

View File

@ -11,12 +11,12 @@ REDHAT_OPTS = {
platform: 'redhat',
version: '7.1',
log_level: ::LOG_LEVEL
}
}.freeze
UBUNTU_OPTS = {
platform: 'ubuntu',
version: '14.04',
log_level: ::LOG_LEVEL
}
}.freeze
shared_context 'telemetry-stubs' do
before do