Style and lint fixes to support newer ChefDK

Change-Id: If87a38d33de73da45648fabf127e3b127fa46045
Depends-On: I6ce4587caa3ae68ddbd3ef1a521aaf46f4840b2c
Depends-On: I0a3872cd3a21c31b5e3a7b6190f911280e9ed909
Depends-On: I34e4c7b29ff7c36c91245d90fb0b6897847cd22f
Depends-On: Ie45076f0ee36e880c9a6080f2b330982e40c282c
This commit is contained in:
Samuel Cassiba 2016-07-06 12:52:22 -07:00
parent 64c25ea5fc
commit c6c3537242
4 changed files with 12 additions and 10 deletions

View File

@ -13,8 +13,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
========
@ -29,10 +29,10 @@ Cookbooks
The following cookbooks are dependencies:
- 'ceph', '>= 0.8.1'
- 'openstack-common', '>= 13.0.0'
- 'openstack-identity', '>= 13.0.0'
- 'openstack-image', '>= 13.0.0'
- 'openstack-network', '>= 13.0.0'
- 'openstack-common', '>= 14.0.0'
- 'openstack-identity', '>= 14.0.0'
- 'openstack-image', '>= 14.0.0'
- 'openstack-network', '>= 14.0.0'
- 'python', '~> 1.4.6'
Attributes

View File

@ -99,18 +99,18 @@ default['openstack']['compute']['ratelimit']['settings'] = {
default['openstack']['compute']['metering'] = false ####
# Notification settings
default['openstack']['compute']['config']['notification_topics'] = ['notifications']
if node['openstack']['compute']['metering']
default['openstack']['compute']['config']['notification_drivers'] = ['nova.openstack.common.notifier.rpc_notifier', 'ceilometer.compute.nova_notifier']
default['openstack']['compute']['config']['instance_usage_audit'] = 'True'
default['openstack']['compute']['config']['instance_usage_audit_period'] = 'hour'
default['openstack']['compute']['config']['notify_on_state_change'] = 'vm_and_task_state'
default['openstack']['compute']['config']['notification_topics'] = ['notifications']
else
default['openstack']['compute']['config']['notification_drivers'] = []
default['openstack']['compute']['config']['instance_usage_audit'] = 'False'
default['openstack']['compute']['config']['instance_usage_audit_period'] = 'month'
default['openstack']['compute']['config']['notify_on_state_change'] = ''
default['openstack']['compute']['config']['notification_topics'] = ['notifications']
end
# Monitor settings

View File

@ -1,6 +1,8 @@
name 'openstack-compute'
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-compute' if respond_to?(:source_url)
license 'Apache 2.0'
description 'The OpenStack Compute service Nova.'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))

View File

@ -14,13 +14,13 @@ REDHAT_OPTS = {
platform: 'redhat',
version: '7.1',
log_level: LOG_LEVEL
}
}.freeze
UBUNTU_OPTS = {
platform: 'ubuntu',
version: '14.04',
log_level: LOG_LEVEL,
file_cache_path: Chef::Config[:file_cache_path]
}
}.freeze
shared_context 'compute_stubs' do
before do