Style and lint fixes to support newer ChefDK

Change-Id: Iad5e2b8a6732f21e4727a299567574e519b47e3c
Depends-On: I6ce4587caa3ae68ddbd3ef1a521aaf46f4840b2c
Depends-On: I34e4c7b29ff7c36c91245d90fb0b6897847cd22f
This commit is contained in:
Samuel Cassiba 2016-07-06 12:09:31 -07:00
parent 4b0d41b64f
commit aeab158117
3 changed files with 10 additions and 6 deletions

View File

@ -10,15 +10,17 @@ https://wiki.openstack.org/wiki/Trove
Requirements
============
Chef 11
- Chef 12 or higher
- chefdk 0.9.0 or higher for tsting (also includes berkshelf for cookbook
dependency resolution)
Cookbooks
---------
The following cookbooks are dependencies:
* openstack-common
* openstack-identity
* 'openstack-common', '>= 14.0.0'
* 'openstack-identity', '>= 14.0.0'
Usage

View File

@ -1,6 +1,8 @@
name 'openstack-database'
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-database' if respond_to?(:source_url)
license 'Apache 2.0'
description 'Installs/Configures trove'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))

View File

@ -9,17 +9,17 @@ SUSE_OPTS = {
platform: 'suse',
version: '11.3',
log_level: ::LOG_LEVEL
}
}.freeze
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 'database-stubs' do
before do