openstack
/
fuel-library
Code Issues Proposed changes

Remove deprecated neutron parameters 

external_network_bridge and mac_generation_retries were
deprecated and have no effect so remove them

Change-Id: Ic2c791fcff2e59ac579020c1b87f2365402c2aae
Partial-Bug: #1477967
(cherry picked from commit 3508006b72)
This commit is contained in:
Mykyta Karpin 2017-01-10 18:22:36 +02:00
parent d12b1201a1
commit 6324d572f6
4 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deployment/puppet/openstack_tasks/manifests/openstack_network/agents/l3.pp
View File

@ -33,7 +33,6 @@ class openstack_tasks::openstack_network::agents::l3 {
class { '::neutron::agents::l3':
debug => $debug,
metadata_port => $metadata_port,
external_network_bridge => ' ',
manage_service => true,
enabled => true,
agent_mode => $agent_mode,

1
deployment/puppet/openstack_tasks/manifests/openstack_network/common_config.pp
View File

@ -85,7 +85,6 @@ class openstack_tasks::openstack_network::common_config {
core_plugin => $core_plugin,
service_plugins => $service_plugins,
allow_overlapping_ips => true,
mac_generation_retries => '32',
dhcp_lease_duration => $dhcp_lease_duration,
dhcp_agents_per_network => '2',
report_interval => $neutron_config['neutron_report_interval'],

6
tests/noop/spec/hosts/openstack-network/agents/l3_spec.rb
View File

@ -55,9 +55,6 @@ describe manifest do
it { should contain_class('neutron::agents::l3').with(
'debug' => Noop.hiera('debug', true)
)}
it { should contain_class('neutron::agents::l3').with(
'external_network_bridge' => ' ' # should be present and empty
)}
it { should_not contain_cluster__neutron__l3('default-l3') }
include_examples 'override_resources'
@ -90,9 +87,6 @@ describe manifest do
it { should contain_class('neutron::agents::l3').with(
'debug' => Noop.hiera('debug', true)
)}
it { should contain_class('neutron::agents::l3').with(
'external_network_bridge' => ' ' # should be present and empty
)}
if ha_agent
it { should contain_cluster__neutron__l3('default-l3').with(

1
tests/noop/spec/hosts/openstack-network/common-config_spec.rb
View File

@ -39,7 +39,6 @@ describe manifest do
it { should contain_class('neutron').with('report_interval' => neutron_config['neutron_report_interval'])}
it { should contain_class('neutron').with('dhcp_agents_per_network' => '2')}
it { should contain_class('neutron').with('dhcp_lease_duration' => neutron_config['L3'].fetch('dhcp_lease_duration', '600'))}
it { should contain_class('neutron').with('mac_generation_retries' => '32')}
it { should contain_class('neutron').with('allow_overlapping_ips' => 'true')}
it { should contain_class('neutron').with('base_mac' => neutron_config['L2']['base_mac'])}
it { should contain_class('neutron').with('core_plugin' => 'neutron.plugins.ml2.plugin.Ml2Plugin')}