From bea61ade60e87375c44d242ae196292776332d6c Mon Sep 17 00:00:00 2001 From: Chris Ricker Date: Mon, 7 Apr 2014 13:44:45 -0700 Subject: [PATCH] Remove duplicate instance_usage_audit nova.conf parameters for ceilometer notifications are defined in both puppet-ceilometer and puppet-nova due to change I9e10dfb2. Remove the redundant definition from puppet-ceilometer. Change-Id: I7f27a731b68359b22785e3807beaf94a39f185bf Closes-Bug: #1304017 --- manifests/agent/compute.pp | 5 ----- spec/classes/ceilometer_agent_compute_spec.rb | 5 ----- 2 files changed, 10 deletions(-) diff --git a/manifests/agent/compute.pp b/manifests/agent/compute.pp index c07d717..fde3705 100644 --- a/manifests/agent/compute.pp +++ b/manifests/agent/compute.pp @@ -45,11 +45,6 @@ class ceilometer::agent::compute ( hasrestart => true, } - nova_config { - 'DEFAULT/instance_usage_audit' : value => 'True'; - 'DEFAULT/instance_usage_audit_period' : value => 'hour'; - } - #NOTE(dprince): This is using a custom (inline) file_line provider # until this lands upstream: # https://github.com/puppetlabs/puppetlabs-stdlib/pull/174 diff --git a/spec/classes/ceilometer_agent_compute_spec.rb b/spec/classes/ceilometer_agent_compute_spec.rb index 3d5ed9a..16f19a0 100644 --- a/spec/classes/ceilometer_agent_compute_spec.rb +++ b/spec/classes/ceilometer_agent_compute_spec.rb @@ -48,11 +48,6 @@ describe 'ceilometer::agent::compute' do ) end - it 'configures instance usage audit in nova' do - should contain_nova_config('DEFAULT/instance_usage_audit').with_value('True') - should contain_nova_config('DEFAULT/instance_usage_audit_period').with_value('hour') - end - it 'configures nova notification driver' do should contain_file_line_after('nova-notification-driver-common').with( :line => 'notification_driver=nova.openstack.common.notifier.rpc_notifier', -- 2.45.2