openstack
/
puppet-neutron
Code Issues Proposed changes

Merge "Support arbitrary configurations for ovs agent and sriov agent" into stable/train

This commit is contained in:
Zuul 2021-10-29 01:14:36 +00:00 committed by Gerrit Code Review
parent d462f9bee2 817d45342a
commit eb509c49e3
3 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/config.pp
View File

@ -27,6 +27,12 @@
# [*api_config*]
# (optional) Manage configuration of api-paste.ini
#
# [*ovs_agent_config*]
# (optional) Manage configuration of openvswitch_agent.ini
#
# [*sriov_agent_config*]
# (optional) Manage configuration of sriov_agent.ini
#
# [*bgpvpn_bagpipe_config*]
# (optional) Manage configuration of bagpipe-bgp bgp.conf
#
@ -102,6 +108,8 @@
class neutron::config (
$server_config = {},
$api_config = {},
$ovs_agent_config = {},
$sriov_agent_config = {},
$bgpvpn_bagpipe_config = {},
$bgpvpn_service_config = {},
$l2gw_agent_config = {},
@ -131,6 +139,8 @@ class neutron::config (
validate_legacy(Hash, 'validate_hash', $server_config)
validate_legacy(Hash, 'validate_hash', $api_config)
validate_legacy(Hash, 'validate_hash', $ovs_agent_config)
validate_legacy(Hash, 'validate_hash', $sriov_agent_config)
validate_legacy(Hash, 'validate_hash', $bgpvpn_bagpipe_config)
validate_legacy(Hash, 'validate_hash', $bgpvpn_service_config)
validate_legacy(Hash, 'validate_hash', $l2gw_agent_config)
@ -157,6 +167,8 @@ class neutron::config (
create_resources('neutron_config', $server_config)
create_resources('neutron_api_config', $api_config)
create_resources('neutron_agent_ovs', $ovs_agent_config)
create_resources('neutron_sriov_agent_config', $sriov_agent_config)
create_resources('neutron_bgpvpn_bagpipe_config', $bgpvpn_bagpipe_config)
create_resources('neutron_bgpvpn_service_config', $bgpvpn_service_config)
create_resources('neutron_l2gw_agent_config', $l2gw_agent_config)

8
releasenotes/notes/agent-arbitrary-configs-8036223e87f32c2a.yaml Normal file
View File

@ -0,0 +1,8 @@
---
features:
- |
The following new parameters have been added to support arbitrary
configurations for openvsiwtch_agent.ini and sriov_agent.ini
- ``neutron::config::ovs_agent_config``
- ``neutron::config::sriov_agent_config``

17
spec/classes/neutron_config_spec.rb
View File

@ -56,7 +56,9 @@ describe 'neutron::config' do
shared_examples 'neutron_agent_config' do
let :params do
{ :l3_agent_config => config_hash,
{ :ovs_agent_config => config_hash,
:sriov_agent_config => config_hash,
:l3_agent_config => config_hash,
:dhcp_agent_config => config_hash,
:metadata_agent_config => config_hash,
:metering_agent_config => config_hash,
@ -66,6 +68,18 @@ describe 'neutron::config' do
}
end
it 'configures arbitrary neutron_ovs_agent_config configurations' do
should contain_neutron_agent_ovs('DEFAULT/foo').with_value('fooValue')
should contain_neutron_agent_ovs('DEFAULT/bar').with_value('barValue')
should contain_neutron_agent_ovs('DEFAULT/baz').with_ensure('absent')
end
it 'configures arbitrary neutron_sriov_agent_config configurations' do
should contain_neutron_sriov_agent_config('DEFAULT/foo').with_value('fooValue')
should contain_neutron_sriov_agent_config('DEFAULT/bar').with_value('barValue')
should contain_neutron_sriov_agent_config('DEFAULT/baz').with_ensure('absent')
end
it 'configures arbitrary l3_agent_config configurations' do
should contain_neutron_l3_agent_config('DEFAULT/foo').with_value('fooValue')
should contain_neutron_l3_agent_config('DEFAULT/bar').with_value('barValue')
@ -205,6 +219,7 @@ describe 'neutron::config' do
it_behaves_like 'neutron_config'
it_behaves_like 'neutron_api_config'
it_behaves_like 'neutron_service_config'
it_behaves_like 'neutron_agent_config'
it_behaves_like 'neutron_plugin_config'
end