openstack
/
puppet-neutron
Code Issues Proposed changes

Merge "Add driver option for metering agent"

This commit is contained in:
Jenkins 2015-10-28 08:31:44 +00:00 committed by Gerrit Code Review
parent 78c928a954 8118878975
commit 20fa3e00f5
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/agents/metering.pp
View File

@ -37,6 +37,9 @@
# [*interface_driver*]
# (optional) Defaults to 'neutron.agent.linux.interface.OVSInterfaceDriver'.
#
# [*driver*]
# (optional) Defaults to 'neutron.services.metering.drivers.noop.noop_driver.NoopMeteringDriver'.
#
# [*measure_interval*]
# (optional) Interval between two metering measures.
# Defaults to 30.
@ -60,6 +63,7 @@ class neutron::agents::metering (
$manage_service = true,
$debug = false,
$interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver',
$driver = 'neutron.services.metering.drivers.noop.noop_driver.NoopMeteringDriver',
$measure_interval = '30',
$report_interval = '300',
# DEPRECATED PARAMETERS
@ -77,6 +81,7 @@ class neutron::agents::metering (
neutron_metering_agent_config {
'DEFAULT/debug': value => $debug;
'DEFAULT/interface_driver': value => $interface_driver;
'DEFAULT/driver': value => $driver;
'DEFAULT/measure_interval': value => $measure_interval;
'DEFAULT/report_interval': value => $report_interval;
}

11
spec/classes/neutron_agents_metering_spec.rb
View File

@ -37,6 +37,7 @@ describe 'neutron::agents::metering' do
:enabled => true,
:debug => false,
:interface_driver => 'neutron.agent.linux.interface.OVSInterfaceDriver',
:driver => 'neutron.services.metering.drivers.noop.noop_driver.NoopMeteringDriver',
:use_namespaces => nil,
:measure_interval => '30',
:report_interval => '300'
@ -59,6 +60,7 @@ describe 'neutron::agents::metering' do
it 'configures metering_agent.ini' do
is_expected.to contain_neutron_metering_agent_config('DEFAULT/debug').with_value(p[:debug]);
is_expected.to contain_neutron_metering_agent_config('DEFAULT/interface_driver').with_value(p[:interface_driver]);
is_expected.to contain_neutron_metering_agent_config('DEFAULT/driver').with_value(p[:driver]);
is_expected.to contain_neutron_metering_agent_config('DEFAULT/measure_interval').with_value(p[:measure_interval]);
is_expected.to contain_neutron_metering_agent_config('DEFAULT/report_interval').with_value(p[:report_interval]);
end
@ -102,6 +104,15 @@ describe 'neutron::agents::metering' do
is_expected.to contain_neutron_metering_agent_config('DEFAULT/use_namespaces').with_value(p[:use_namespaces])
end
end
context 'with non-default driver' do
before :each do
params.merge!(:driver => 'neutron.services.metering.drivers.iptables.iptables_driver.IptablesMeteringDriver')
end
it 'should properly set driver option' do
is_expected.to contain_neutron_metering_agent_config('DEFAULT/driver').with_value(p[:driver])
end
end
end
context 'on Debian platforms' do