openstack/puppet-neutron
Code Issues Proposed changes

Fix polling_interval section for sriov agent

Browse Source 
Per [0] the agent expects this parameter to be in the agent section, not
the sriov_nic one

[0] eaf990b2bc/neutron/plugins/ml2/drivers/mech_sriov/agent/sriov_nic_agent.py (L557)

Change-Id: I261485331579d791db98643b49ef87a85a8531d8
This commit is contained in:
Bernard Cafarelli 2019-04-05 14:49:11 +02:00
parent ae0af41c7f
commit bfbef8b79d
No known key found for this signature in database
GPG Key ID: D148244A3C2462BD
2 changed files with 2 additions and 2 deletions
manifests/agents/ml2
sriov.pp
spec/classes
neutron_agents_ml2_sriov_spec.rb

2
manifests/agents/ml2/sriov.pp

@ -89,10 +89,10 @@ class neutron::agents::ml2::sriov (
}
neutron_sriov_agent_config {
'sriov_nic/polling_interval': value => $polling_interval;
'sriov_nic/exclude_devices': value => pick(join(any2array($exclude_devices), ','), $::os_service_default);
'sriov_nic/physical_device_mappings': value => pick(join(any2array($physical_device_mappings), ','), $::os_service_default);
'agent/extensions': value => join(any2array($extensions), ',');
'agent/polling_interval': value => $polling_interval;
# As of now security groups are not supported for SR-IOV ports.
# It is required to disable Firewall driver in the SR-IOV agent config.
'securitygroup/firewall_driver': value => 'noop';

2
spec/classes/neutron_agents_ml2_sriov_spec.rb

@ -34,10 +34,10 @@ describe 'neutron::agents::ml2::sriov' do
end
it 'configures /etc/neutron/plugins/ml2/sriov_agent.ini' do
should contain_neutron_sriov_agent_config('sriov_nic/polling_interval').with_value(p[:polling_interval])
should contain_neutron_sriov_agent_config('sriov_nic/exclude_devices').with_value('<SERVICE DEFAULT>')
should contain_neutron_sriov_agent_config('sriov_nic/physical_device_mappings').with_value('<SERVICE DEFAULT>')
should contain_neutron_sriov_agent_config('agent/extensions').with_value(['<SERVICE DEFAULT>'])
should contain_neutron_sriov_agent_config('agent/polling_interval').with_value(p[:polling_interval])
should contain_neutron_sriov_agent_config('securitygroup/firewall_driver').with_value('noop')
end