openstack/puppet-neutron
Code Issues Proposed changes

Use stevedore aliases for firewall_driver options

Browse Source 
Those are public; import paths are private and are not supposed to be
used by operators.

Change-Id: If6e36389eb5a8e5101e060414fd5f86b0dff8e8c
This commit is contained in:
Ihar Hrachyshka 2016-12-03 03:13:04 +00:00
parent cbe9fd1207
commit b6a102f2d0
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/agents/ml2/linuxbridge.pp
View File

@ -56,7 +56,7 @@
# #
# [*firewall_driver*] # [*firewall_driver*]
# (optional) Firewall driver for realizing neutron security group function. # (optional) Firewall driver for realizing neutron security group function.
# Defaults to 'neutron.agent.linux.iptables_firewall.IptablesFirewallDriver'. # Defaults to 'iptables'.
# #
# [*purge_config*] # [*purge_config*]
# (optional) Whether to set only the specified config options # (optional) Whether to set only the specified config options
@ -75,7 +75,7 @@ class neutron::agents::ml2::linuxbridge (
$polling_interval = $::os_service_default, $polling_interval = $::os_service_default,
$l2_population = $::os_service_default, $l2_population = $::os_service_default,
$physical_interface_mappings = [], $physical_interface_mappings = [],
$firewall_driver = 'neutron.agent.linux.iptables_firewall.IptablesFirewallDriver', $firewall_driver = 'iptables',
$purge_config = false, $purge_config = false,
) { ) {

4
manifests/agents/ml2/ovs.pp
View File

@ -81,7 +81,7 @@
# #
# [*firewall_driver*] # [*firewall_driver*]
# (optional) Firewall driver for realizing neutron security group function. # (optional) Firewall driver for realizing neutron security group function.
# Defaults to 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'. # Defaults to 'iptables_hybrid'.
# #
# [*enable_distributed_routing*] # [*enable_distributed_routing*]
# (optional) Set to True on L2 agents to enable support # (optional) Set to True on L2 agents to enable support
@ -165,7 +165,7 @@ class neutron::agents::ml2::ovs (
$polling_interval = $::os_service_default, $polling_interval = $::os_service_default,
$l2_population = $::os_service_default, $l2_population = $::os_service_default,
$arp_responder = $::os_service_default, $arp_responder = $::os_service_default,
$firewall_driver = 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver', $firewall_driver = 'iptables_hybrid',
$enable_distributed_routing = $::os_service_default, $enable_distributed_routing = $::os_service_default,
$drop_flows_on_start = false, $drop_flows_on_start = false,
$manage_vswitch = true, $manage_vswitch = true,

2
manifests/agents/ml2/sriov.pp
View File

@ -95,7 +95,7 @@ class neutron::agents::ml2::sriov (
'agent/extensions': value => join(any2array($extensions), ','); 'agent/extensions': value => join(any2array($extensions), ',');
# As of now security groups are not supported for SR-IOV ports. # 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. # It is required to disable Firewall driver in the SR-IOV agent config.
'securitygroup/firewall_driver': value => 'neutron.agent.firewall.NoopFirewallDriver'; 'securitygroup/firewall_driver': value => 'noop';
} }
if !is_service_default($number_of_vfs) and !empty($number_of_vfs) { if !is_service_default($number_of_vfs) and !empty($number_of_vfs) {

2
spec/classes/neutron_agents_ml2_linuxbridge_spec.rb
View File

@ -13,7 +13,7 @@ describe 'neutron::agents::ml2::linuxbridge' do
:tunnel_types => [], :tunnel_types => [],
:local_ip => false, :local_ip => false,
:physical_interface_mappings => [], :physical_interface_mappings => [],
:firewall_driver => 'neutron.agent.linux.iptables_firewall.IptablesFirewallDriver', :firewall_driver => 'iptables',
:purge_config => false,} :purge_config => false,}
end end

2
spec/classes/neutron_agents_ml2_ovs_spec.rb
View File

@ -15,7 +15,7 @@ describe 'neutron::agents::ml2::ovs' do
:tunnel_types => [], :tunnel_types => [],
:tunnel_bridge => 'br-tun', :tunnel_bridge => 'br-tun',
:drop_flows_on_start => false, :drop_flows_on_start => false,
:firewall_driver => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver', :firewall_driver => 'iptables_hybrid',
:manage_vswitch => true, :manage_vswitch => true,
:purge_config => false, :purge_config => false,
:enable_dpdk => false, :enable_dpdk => false,

2
spec/classes/neutron_agents_ml2_sriov_spec.rb
View File

@ -44,7 +44,7 @@ describe 'neutron::agents::ml2::sriov' do
is_expected.to contain_neutron_sriov_agent_config('sriov_nic/exclude_devices').with_value('<SERVICE DEFAULT>') is_expected.to contain_neutron_sriov_agent_config('sriov_nic/exclude_devices').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_sriov_agent_config('sriov_nic/physical_device_mappings').with_value('<SERVICE DEFAULT>') is_expected.to contain_neutron_sriov_agent_config('sriov_nic/physical_device_mappings').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_sriov_agent_config('agent/extensions').with_value(['<SERVICE DEFAULT>']) is_expected.to contain_neutron_sriov_agent_config('agent/extensions').with_value(['<SERVICE DEFAULT>'])
is_expected.to contain_neutron_sriov_agent_config('securitygroup/firewall_driver').with_value('neutron.agent.firewall.NoopFirewallDriver') is_expected.to contain_neutron_sriov_agent_config('securitygroup/firewall_driver').with_value('noop')
end end
it 'does not configure numvfs by default' do it 'does not configure numvfs by default' do

4
spec/classes/neutron_plugins_ml2_spec.rb
View File

@ -106,12 +106,12 @@ describe 'neutron::plugins::ml2' do
before :each do before :each do
params.merge!( params.merge!(
:enable_security_group => true, :enable_security_group => true,
:firewall_driver => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver', :firewall_driver => 'iptables_hybrid',
) )
end end
it 'configures enable_security_group and firewall_driver options' do it 'configures enable_security_group and firewall_driver options' do
is_expected.to contain_neutron_plugin_ml2('securitygroup/enable_security_group').with_value('true') is_expected.to contain_neutron_plugin_ml2('securitygroup/enable_security_group').with_value('true')
is_expected.to contain_neutron_plugin_ml2('securitygroup/firewall_driver').with_value('neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver') is_expected.to contain_neutron_plugin_ml2('securitygroup/firewall_driver').with_value('iptables_hybrid')
end end
end end