Style and lint fixes to support newer ChefDK
Change-Id: Ie45076f0ee36e880c9a6080f2b330982e40c282c
This commit is contained in:
parent
69454c062f
commit
77060a6212
|
@ -18,8 +18,8 @@ Requirements
|
||||||
============
|
============
|
||||||
|
|
||||||
- Chef 12 or higher
|
- Chef 12 or higher
|
||||||
- chefdk 0.9.0 for testing (also includes berkshelf for cookbook dependency
|
- chefdk 0.9.0 or higher for testing (also includes berkshelf for cookbook
|
||||||
resolution)
|
dependency resolution)
|
||||||
|
|
||||||
Platform
|
Platform
|
||||||
========
|
========
|
||||||
|
@ -33,8 +33,8 @@ Cookbooks
|
||||||
|
|
||||||
The following cookbooks are dependencies:
|
The following cookbooks are dependencies:
|
||||||
|
|
||||||
- 'openstack-common', '>= 13.0.0'
|
- 'openstack-common', '>= 14.0.0'
|
||||||
- 'openstack-identity', '>= 13.0.0'
|
- 'openstack-identity', '>= 14.0.0'
|
||||||
|
|
||||||
Attributes
|
Attributes
|
||||||
==========
|
==========
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
name 'openstack-network'
|
name 'openstack-network'
|
||||||
maintainer 'openstack-chef'
|
maintainer 'openstack-chef'
|
||||||
maintainer_email 'openstack-dev@lists.openstack.org'
|
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-network' if respond_to?(:source_url)
|
||||||
license 'Apache 2.0'
|
license 'Apache 2.0'
|
||||||
description 'Installs and configures the OpenStack Network API Service and various agents and plugins'
|
description 'Installs and configures the OpenStack Network API Service and various agents and plugins'
|
||||||
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
|
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
|
||||||
|
|
|
@ -12,17 +12,17 @@ REDHAT_OPTS = {
|
||||||
platform: 'redhat',
|
platform: 'redhat',
|
||||||
version: '7.1',
|
version: '7.1',
|
||||||
log_level: LOG_LEVEL
|
log_level: LOG_LEVEL
|
||||||
}
|
}.freeze
|
||||||
UBUNTU_OPTS = {
|
UBUNTU_OPTS = {
|
||||||
platform: 'ubuntu',
|
platform: 'ubuntu',
|
||||||
version: '14.04',
|
version: '14.04',
|
||||||
log_level: LOG_LEVEL
|
log_level: LOG_LEVEL
|
||||||
}
|
}.freeze
|
||||||
CENTOS_OPTS = {
|
CENTOS_OPTS = {
|
||||||
platform: 'centos',
|
platform: 'centos',
|
||||||
version: '6.5',
|
version: '6.5',
|
||||||
log_level: LOG_LEVEL
|
log_level: LOG_LEVEL
|
||||||
}
|
}.freeze
|
||||||
|
|
||||||
shared_context 'neutron-stubs' do
|
shared_context 'neutron-stubs' do
|
||||||
before do
|
before do
|
||||||
|
|
Loading…
Reference in New Issue