From 7156a85ffb935afc59cc268eb8a45d385412865c Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Sat, 21 Jan 2017 21:16:52 +0800 Subject: [PATCH] Remove external_network_bridge option The external_network_bridge parameter has been deprecated and will be removed in Ocata. Change-Id: I866f405f35445069ce52fc47d53c28e03e8ab2f1 Depends-On: Ifd9fd2393ceb9b0d1a4b83a9954d581a43bdb0d4 --- manifests/agents/l3.pp | 13 ------------- manifests/agents/vpnaas.pp | 14 -------------- ...al_network_bridge-options-613a8793ef13d761.yaml | 3 +++ spec/classes/neutron_agents_l3_spec.rb | 1 - spec/classes/neutron_agents_vpnaas_spec.rb | 13 ------------- 5 files changed, 3 insertions(+), 41 deletions(-) create mode 100644 releasenotes/notes/remove_deprecated_external_network_bridge-options-613a8793ef13d761.yaml diff --git a/manifests/agents/l3.pp b/manifests/agents/l3.pp index df25e3e33..651c75081 100644 --- a/manifests/agents/l3.pp +++ b/manifests/agents/l3.pp @@ -92,12 +92,6 @@ # (optional) L3 agent extensions to enable. # Defaults to $::os_service_default # -# === Deprecated Parameters -# -# [*external_network_bridge*] -# (optional) Deprecated. The name of the external bridge -# Defaults to $::os_service_default -# class neutron::agents::l3 ( $package_ensure = 'present', $enabled = true, @@ -119,17 +113,11 @@ class neutron::agents::l3 ( $purge_config = false, $availability_zone = $::os_service_default, $extensions = $::os_service_default, - # DEPRECATED PARAMETERS - $external_network_bridge = $::os_service_default, ) { include ::neutron::deps include ::neutron::params - if ! is_service_default ($external_network_bridge) { - warning('parameter external_network_bridge is deprecated') - } - resources { 'neutron_l3_agent_config': purge => $purge_config, } @@ -144,7 +132,6 @@ class neutron::agents::l3 ( neutron_l3_agent_config { 'DEFAULT/debug': value => $debug; - 'DEFAULT/external_network_bridge': value => $external_network_bridge; 'DEFAULT/interface_driver': value => $interface_driver; 'DEFAULT/gateway_external_network_id': value => $gateway_external_network_id; 'DEFAULT/handle_internal_only_routers': value => $handle_internal_only_routers; diff --git a/manifests/agents/vpnaas.pp b/manifests/agents/vpnaas.pp index 1bab10e7c..52eb40266 100644 --- a/manifests/agents/vpnaas.pp +++ b/manifests/agents/vpnaas.pp @@ -45,18 +45,12 @@ # in the vpnaas config. # Defaults to false. # -# === Deprecated Parameters -# -# [*external_network_bridge*] -# (optional) Deprecated. Defaults to $::os_service_default -# class neutron::agents::vpnaas ( $package_ensure = present, $enabled = true, $manage_service = true, $vpn_device_driver = 'neutron.services.vpn.device_drivers.ipsec.OpenSwanDriver', $interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver', - $external_network_bridge = $::os_service_default, $ipsec_status_check_interval = $::os_service_default, $purge_config = false, ) { @@ -103,14 +97,6 @@ class neutron::agents::vpnaas ( 'DEFAULT/interface_driver': value => $interface_driver; } - if ! is_service_default ($external_network_bridge) { - warning('parameter external_network_bridge is deprecated') - } - - neutron_vpnaas_agent_config { - 'DEFAULT/external_network_bridge': value => $external_network_bridge; - } - if $::neutron::params::vpnaas_agent_package { ensure_resource( 'package', 'neutron-vpnaas-agent', { 'ensure' => $package_ensure, diff --git a/releasenotes/notes/remove_deprecated_external_network_bridge-options-613a8793ef13d761.yaml b/releasenotes/notes/remove_deprecated_external_network_bridge-options-613a8793ef13d761.yaml new file mode 100644 index 000000000..10464012c --- /dev/null +++ b/releasenotes/notes/remove_deprecated_external_network_bridge-options-613a8793ef13d761.yaml @@ -0,0 +1,3 @@ +--- +deprecations: + - Removed deprecated option external_network_bridge. diff --git a/spec/classes/neutron_agents_l3_spec.rb b/spec/classes/neutron_agents_l3_spec.rb index 0f027cf52..19afe0a33 100644 --- a/spec/classes/neutron_agents_l3_spec.rb +++ b/spec/classes/neutron_agents_l3_spec.rb @@ -37,7 +37,6 @@ describe 'neutron::agents::l3' do it 'configures l3_agent.ini' do is_expected.to contain_neutron_l3_agent_config('DEFAULT/debug').with_value(p[:debug]) - is_expected.to contain_neutron_l3_agent_config('DEFAULT/external_network_bridge').with_value('') is_expected.to contain_neutron_l3_agent_config('DEFAULT/interface_driver').with_value(p[:interface_driver]) is_expected.to contain_neutron_l3_agent_config('DEFAULT/gateway_external_network_id').with_value('') is_expected.to contain_neutron_l3_agent_config('DEFAULT/handle_internal_only_routers').with_value('') diff --git a/spec/classes/neutron_agents_vpnaas_spec.rb b/spec/classes/neutron_agents_vpnaas_spec.rb index 16dfe6fac..a8631cff4 100644 --- a/spec/classes/neutron_agents_vpnaas_spec.rb +++ b/spec/classes/neutron_agents_vpnaas_spec.rb @@ -64,19 +64,6 @@ describe 'neutron::agents::vpnaas' do is_expected.to contain_neutron_vpnaas_agent_config('vpnagent/vpn_device_driver').with_value(p[:vpn_device_driver]); is_expected.to contain_neutron_vpnaas_agent_config('ipsec/ipsec_status_check_interval').with_value(''); is_expected.to contain_neutron_vpnaas_agent_config('DEFAULT/interface_driver').with_value(p[:interface_driver]); - is_expected.to contain_neutron_vpnaas_agent_config('DEFAULT/external_network_bridge').with_value(''); - end - - context 'with external_network_bridge as br-ex' do - before do - params.merge!( - :external_network_bridge => 'br-ex' - ) - end - - it 'configures vpnaas_agent.ini' do - is_expected.to contain_neutron_vpnaas_agent_config('DEFAULT/external_network_bridge').with_value(p[:external_network_bridge]); - end end it 'installs neutron vpnaas agent package' do