Style and lint fixes to support newer ChefDK
Change-Id: Iccd706e2b804065c343c317f63783592e091c415
Depends-On: I34e4c7b29ff7c36c91245d90fb0b6897847cd22f
(cherry picked from commit 1e41bc7811
)
This commit is contained in:
parent
65fbef6216
commit
603a84e33a
|
@ -10,8 +10,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)
|
||||
|
||||
Platform
|
||||
========
|
||||
|
@ -25,8 +25,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
|
||||
==========
|
||||
|
|
|
@ -2,6 +2,8 @@
|
|||
name 'openstack-orchestration'
|
||||
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-orchestration' if respond_to?(:source_url)
|
||||
license 'Apache 2.0'
|
||||
description 'Installs and configures the Heat Service'
|
||||
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
|
||||
|
|
|
@ -11,17 +11,17 @@ REDHAT_OPTS = {
|
|||
platform: 'redhat',
|
||||
version: '7.1',
|
||||
log_level: ::LOG_LEVEL
|
||||
}
|
||||
}.freeze
|
||||
UBUNTU_OPTS = {
|
||||
platform: 'ubuntu',
|
||||
version: '14.04',
|
||||
log_level: ::LOG_LEVEL
|
||||
}
|
||||
}.freeze
|
||||
SUSE_OPTS = {
|
||||
platform: 'suse',
|
||||
version: '11.3',
|
||||
log_level: ::LOG_LEVEL
|
||||
}
|
||||
}.freeze
|
||||
|
||||
shared_context 'orchestration_stubs' do
|
||||
before do
|
||||
|
|
Loading…
Reference in New Issue