Style and lint fixes to support newer ChefDK

Change-Id: If08006279134ecaed1ab49c6dd6d51e5bcab7f88
Depends-On: I6ce4587caa3ae68ddbd3ef1a521aaf46f4840b2c
This commit is contained in:
Samuel Cassiba 2016-07-06 13:50:44 -07:00
parent 0bed11e7d0
commit 09a7de3b5e
4 changed files with 11 additions and 10 deletions

View File

@ -2,8 +2,6 @@ source 'https://supermarket.chef.io'
metadata
cookbook "openstack-bare-metal",
github: "openstack/cookbook-openstack-bare-metal"
cookbook "openstack-common",
github: "openstack/cookbook-openstack-common"
cookbook "openstack-identity",

View File

@ -6,18 +6,19 @@ This cookbook installs the OpenStack Integration Test Suite **Tempest** as part
Requirements
============
Chef 11 or higher required (for Chef environment use).
- Chef 12 or higher
- chefdk 0.9.0 or higher for testing
Cookbooks
---------
The following cookbooks are dependencies:
* openstack-common
* openstack-identity
* openstack-image
* openstack-compute
* openstack-block-storage
* 'openstack-common', '>= 14.0.0'
* 'openstack-identity', '>= 14.0.0'
* 'openstack-image', '>= 14.0.0'
* 'openstack-compute', '>= 14.0.0'
* 'openstack-block-storage', '>= 14.0.0'
Usage
=====

View File

@ -2,6 +2,8 @@
name 'openstack-integration-test'
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-integration-test' if respond_to?(:source_url)
license 'Apache 2.0'
description 'Installs and configures the Tempest Integration Test Suite'
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 'tempest-stubs' do
before do