openstack/puppet-neutron
Code Issues Proposed changes

Remove deprecated options from agents

Browse Source 
* Remove deprecated options:
  - use_namespaces [l3/dhcp/lbaas][0]
  - allow_automatic_l3agent_failover [l3][1]
  - network_device_mtu [l3][4]
  - {router,dhcp}_delete_namespaces [l3/dhcp][2]
  - auth_{password,tenant,user,url,insecure,region} [metadata]
* Deprecate router_id in L3 Agent[3]

0 - https://review.openstack.org/#/c/238213/
1 - https://review.openstack.org/#/c/158858/
2 - https://review.openstack.org/#/c/237779/
3 - https://review.openstack.org/#/c/248498/
4 - https://review.openstack.org/#/c/100041/

Change-Id: I2c88f8523630ad0246785190f90b7a02fc704153
This commit is contained in:
Jerzy Mikolajczak
2016-04-04 14:22:04 +02:00
parent 70230b2c38
commit 3f019235b9
10 changed files with 17 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
manifests/agents/dhcp.pp
View File

@@ -71,20 +71,10 @@
#
# === Deprecated Parameters
#
# [*dhcp_delete_namespaces*]
# (optional) Deprecated. Delete namespace after removing a dhcp server
# Defaults to $::os_service_default.
#
# [*dhcp_domain*]
# (optional) Deprecated. Domain to use for building the hostnames
# Defaults to $::os_service_default
#
# [*use_namespaces*]
# (optional) Deprecated. 'True' value will be enforced in future releases.
# Allow overlapping IP (Must have kernel build with
# CONFIG_NET_NS=y and iproute2 package that supports namespaces).
# Defaults to $::os_service_default.
#
class neutron::agents::dhcp (
$package_ensure = present,
$enabled = true,
@@ -103,9 +93,7 @@ class neutron::agents::dhcp (
$dhcp_broadcast_reply = $::os_service_default,
$purge_config = false,
# DEPRECATED PARAMETERS
$dhcp_delete_namespaces = $::os_service_default,
$dhcp_domain = $::os_service_default,
$use_namespaces = $::os_service_default,
) {
include ::neutron::params
@@ -156,21 +144,10 @@ class neutron::agents::dhcp (
'DEFAULT/dnsmasq_dns_servers': value => join(any2array($dnsmasq_dns_servers), ',');
}
if ! is_service_default ($dhcp_delete_namespaces) {
warning('The dhcp_delete_namespaces parameter was removed in Mitaka, it does not take any affect')
}
if ! is_service_default ($dhcp_domain) {
warning('The dhcp_domain parameter is deprecated and will be removed in future releases')
}
if ! is_service_default ($use_namespaces) {
warning('The use_namespaces parameter is deprecated and will be removed in future releases')
neutron_dhcp_agent_config {
'DEFAULT/use_namespaces': value => $use_namespaces;
}
}
if $::neutron::params::dhcp_agent_package {
Package['neutron'] -> Package['neutron-dhcp-agent']
Package['neutron-dhcp-agent'] -> Neutron_config<||>

48
manifests/agents/l3.pp
View File

@@ -26,10 +26,6 @@
# (optional) Driver to interface with neutron
# Defaults to OVSInterfaceDriver
#
# [*router_id*]
# (optional) The ID of the external router in neutron
# Defaults to $::os_service_default
#
# [*gateway_external_network_id*]
# (optional) The ID of the external network in neutron
# Defaults to $::os_service_default
@@ -59,11 +55,6 @@
# (optional) can be set to False if the Nova metadata server is not available
# Defaults to $::os_service_default
#
# [*network_device_mtu*]
# (optional) The MTU size for the interfaces managed by the L3 agent
# Defaults to $::os_service_default
# Should be deprecated in the next major release in favor of a global parameter
#
# [*ha_enabled*]
# (optional) Enabled or not HA for L3 agent.
# Defaults to false
@@ -87,9 +78,6 @@
# 'dvr_snat': enable DVR with centralized SNAT support (DVR for single-host, for testing only)
# Defaults to 'legacy'
#
# [*allow_automatic_l3agent_failover*]
# DEPRECATED: Has no effect in this class. Use the same parameter in neutron::server instead.
#
# [*purge_config*]
# (optional) Whether to set only the specified config options
# in the l3 config.
@@ -97,19 +85,13 @@
#
# === Deprecated Parameters
#
# [*use_namespaces*]
# (optional) Deprecated. 'True' value will be enforced in future releases.
# Allow overlapping IP (Must have kernel build with
# CONFIG_NET_NS=y and iproute2 package that supports namespaces).
# Defaults to $::os_service_default.
#
# [*external_network_bridge*]
# (optional) Deprecated. The name of the external bridge
# Defaults to $::os_service_default
#
# [*router_delete_namespaces*]
# (optional) Deprecated. Namespaces can be deleted cleanly on the host running the L3 agent
# Defaults to ::os_service_default
# [*router_id*]
# (optional) Deprecated. The ID of the external router in neutron
# Defaults to $::os_service_default
#
class neutron::agents::l3 (
$package_ensure = 'present',
@@ -117,7 +99,6 @@ class neutron::agents::l3 (
$manage_service = true,
$debug = false,
$interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver',
$router_id = $::os_service_default,
$gateway_external_network_id = $::os_service_default,
$handle_internal_only_routers = $::os_service_default,
$metadata_port = $::os_service_default,
@@ -125,7 +106,6 @@ class neutron::agents::l3 (
$periodic_interval = $::os_service_default,
$periodic_fuzzy_delay = $::os_service_default,
$enable_metadata_proxy = $::os_service_default,
$network_device_mtu = $::os_service_default,
$ha_enabled = false,
$ha_vrrp_auth_type = 'PASS',
$ha_vrrp_auth_password = $::os_service_default,
@@ -133,24 +113,18 @@ class neutron::agents::l3 (
$agent_mode = 'legacy',
$purge_config = false,
# DEPRECATED PARAMETERS
$allow_automatic_l3agent_failover = false,
$use_namespaces = $::os_service_default,
$external_network_bridge = $::os_service_default,
$router_delete_namespaces = $::os_service_default,
$router_id = $::os_service_default,
) {
include ::neutron::params
if $allow_automatic_l3agent_failover {
warning('parameter allow_automatic_l3agent_failover is deprecated, use parameter in neutron::server instead')
}
if ! is_service_default ($external_network_bridge) {
warning('parameter external_network_bridge is deprecated')
}
if ! is_service_default ($router_delete_namespaces) {
warning('parameter router_delete_namespaces was removed in Mitaka, it does not take any affect')
if ! is_service_default ($router_id) {
warning('parameter router_id is deprecated and will be removed in future release')
}
resources { 'neutron_l3_agent_config':
@@ -178,16 +152,6 @@ class neutron::agents::l3 (
'DEFAULT/periodic_fuzzy_delay': value => $periodic_fuzzy_delay;
'DEFAULT/enable_metadata_proxy': value => $enable_metadata_proxy;
'DEFAULT/agent_mode': value => $agent_mode;
'DEFAULT/network_device_mtu': value => $network_device_mtu;
'DEFAULT/use_namespaces': value => $use_namespaces;
}
if ! is_service_default ($use_namespaces) {
warning('The use_namespaces parameter is deprecated and will be removed in future releases')
}
if ! is_service_default ($network_device_mtu) {
warning('The neutron::agents::l3::network_device_mtu parameter is deprecated, use neutron::network_device_mtu instead.')
}
if $::neutron::params::l3_agent_package {

17
manifests/agents/lbaas.pp
View File

@@ -37,14 +37,6 @@
# in the lbaas config.
# Defaults to false.
#
# === Deprecated Parameters
#
# [*use_namespaces*]
# (optional) Deprecated. 'True' value will be enforced in future releases.
# Allow overlapping IP (Must have kernel build with
# CONFIG_NET_NS=y and iproute2 package that supports namespaces).
# Defaults to $::os_service_default.
#
class neutron::agents::lbaas (
$package_ensure = present,
$enabled = true,
@@ -55,8 +47,6 @@ class neutron::agents::lbaas (
$user_group = $::neutron::params::nobody_user_group,
$manage_haproxy_package = true,
$purge_config = false,
# DEPRECATED PARAMETERS
$use_namespaces = $::os_service_default,
) {
include ::neutron::params
@@ -90,13 +80,6 @@ class neutron::agents::lbaas (
'haproxy/user_group': value => $user_group;
}
if ! is_service_default ($use_namespaces) {
warning('The use_namespaces parameter is deprecated and will be removed in future releases')
neutron_lbaas_agent_config {
'DEFAULT/use_namespaces': value => $use_namespaces;
}
}
Package['neutron'] -> Package['neutron-lbaas-agent']
ensure_resource( 'package', 'neutron-lbaas-agent', {
ensure => $package_ensure,

50
manifests/agents/metadata.pp
View File

@@ -61,25 +61,6 @@
# in the metadata config.
# Defaults to false.
#
# === Deprecated Parameters
# [*auth_password*]
# (required) The password for the administrative user (Defaults to undef).
#
# [*auth_tenant*]
# The administrative user's tenant name (Defaults to undef).
#
# [*auth_user*]
# The administrative user name for OpenStack Networking (Defaults to undef).
#
# [*auth_url*]
# The URL used to validate tokens (Defaults to undef).
#
# [*auth_insecure*]
# turn off verification of the certificate for ssl (Defaults to undef).
#
# [*auth_region*]
# The authentication region (Defaults to undef).
#
class neutron::agents::metadata (
$shared_secret,
@@ -97,13 +78,6 @@ class neutron::agents::metadata (
$nova_client_cert = $::os_service_default,
$nova_client_priv_key = $::os_service_default,
$purge_config = false,
# DEPRECATED PARAMETERS
$auth_password = undef,
$auth_tenant = undef,
$auth_user = undef,
$auth_url = undef,
$auth_insecure = undef,
$auth_region = undef,
) {
include ::neutron::params
@@ -111,30 +85,6 @@ class neutron::agents::metadata (
Neutron_config<||> ~> Service['neutron-metadata']
Neutron_metadata_agent_config<||> ~> Service['neutron-metadata']
if $auth_password {
warning('The auth_password parameter is deprecated and was removed in Mitaka release.')
}
if $auth_tenant {
warning('The auth_tenant parameter is deprecated and was removed in Mitaka release.')
}
if $auth_user {
warning('The auth_user parameter is deprecated and was removed in Mitaka release.')
}
if $auth_url {
warning('The auth_url parameter is deprecated and was removed in Mitaka release.')
}
if $auth_insecure != undef {
warning('The auth_insecure parameter is deprecated and was removed in Mitaka release.')
}
if $auth_region {
warning('The auth_region parameter is deprecated and was removed in Mitaka release.')
}
resources { 'neutron_metadata_agent_config':
purge => $purge_config,
}

17
manifests/agents/metering.pp
View File

@@ -53,14 +53,6 @@
# in the metering config.
# Defaults to false.
#
# === Deprecated Parameters
#
# [*use_namespaces*]
# (optional) Deprecated. 'True' value will be enforced in future releases.
# Allow overlapping IP (Must have kernel build with
# CONFIG_NET_NS=y and iproute2 package that supports namespaces).
# Defaults to $::os_service_default.
#
class neutron::agents::metering (
$package_ensure = present,
@@ -72,8 +64,6 @@ class neutron::agents::metering (
$measure_interval = $::os_service_default,
$report_interval = $::os_service_default,
$purge_config = false,
# DEPRECATED PARAMETERS
$use_namespaces = $::os_service_default,
) {
include ::neutron::params
@@ -96,13 +86,6 @@ class neutron::agents::metering (
'DEFAULT/report_interval': value => $report_interval;
}
if ! is_service_default ($use_namespaces) {
warning('The use_namespaces parameter is deprecated and will be removed in future releases')
neutron_metering_agent_config {
'DEFAULT/use_namespaces': value => $use_namespaces;
}
}
if $::neutron::params::metering_agent_package {
Package['neutron'] -> Package['neutron-metering-agent']
package { 'neutron-metering-agent':

11
releasenotes/notes/newton_remove_deprecated_options-772c33dec894edb1.yaml Normal file
View File

@@ -0,0 +1,11 @@
---
deprecations:
- Deprecated router_id option in l3 agent
other:
- |
Removed deprecated (for at least one cycle) options from agents:
* use_namespaces option from l3/dhcp/lbaas agent
* allow_automatic_l3agent_failover from l3 agent
* network_device_mtu from l3 agent
* auth_password, auth_tenant, auth_user, auth_url, auth_insecure, auth_region from metadata agent

9
spec/classes/neutron_agents_dhcp_spec.rb
View File

@@ -140,15 +140,6 @@ describe 'neutron::agents::dhcp' do
is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/enable_metadata_network').with_value('true');
end
end
context 'with use_namespaces as false' do
before :each do
params.merge!(:use_namespaces => false)
end
it 'should set use_namespaces option' do
is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/use_namespaces').with_value(p[:use_namespaces])
end
end
end
shared_examples_for 'neutron dhcp agent with dnsmasq_config_file specified' do

23
spec/classes/neutron_agents_l3_spec.rb
View File

@@ -47,7 +47,6 @@ describe 'neutron::agents::l3' do
is_expected.to contain_neutron_l3_agent_config('DEFAULT/periodic_interval').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_l3_agent_config('DEFAULT/periodic_fuzzy_delay').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_l3_agent_config('DEFAULT/enable_metadata_proxy').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_l3_agent_config('DEFAULT/network_device_mtu').with_value('<SERVICE DEFAULT>')
end
it 'passes purge to resource' do
@@ -106,26 +105,6 @@ describe 'neutron::agents::l3' do
is_expected.to contain_neutron_l3_agent_config('DEFAULT/ha_vrrp_advert_int').with_value(p[:ha_vrrp_advert_int])
end
end
context 'with use_namespaces as false' do
before :each do
params.merge!(:use_namespaces => false)
end
it 'should set use_namespaces option' do
is_expected.to contain_neutron_l3_agent_config('DEFAULT/use_namespaces').with_value(p[:use_namespaces])
end
end
end
shared_examples_for 'neutron l3 agent with network_device_mtu specified' do
before do
params.merge!(
:network_device_mtu => 9999
)
end
it 'configures network_device_mtu' do
is_expected.to contain_neutron_l3_agent_config('DEFAULT/network_device_mtu').with_value(params[:network_device_mtu])
end
end
context 'on Debian platforms' do
@@ -141,7 +120,6 @@ describe 'neutron::agents::l3' do
end
it_configures 'neutron l3 agent'
it_configures 'neutron l3 agent with network_device_mtu specified'
it 'configures neutron-l3 package subscription' do
is_expected.to contain_service('neutron-l3').that_subscribes_to( [ 'Package[neutron]', 'Package[neutron-l3]' ] )
end
@@ -160,6 +138,5 @@ describe 'neutron::agents::l3' do
end
it_configures 'neutron l3 agent'
it_configures 'neutron l3 agent with network_device_mtu specified'
end
end

10
spec/classes/neutron_agents_lbaas_spec.rb
View File

@@ -15,7 +15,6 @@ describe 'neutron::agents::lbaas' do
:enabled => true,
:interface_driver => 'neutron.agent.linux.interface.OVSInterfaceDriver',
:device_driver => 'neutron_lbaas.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver',
:use_namespaces => nil,
:manage_haproxy_package => true,
:purge_config => false
}
@@ -79,15 +78,6 @@ describe 'neutron::agents::lbaas' do
is_expected.to contain_service('neutron-lbaas-service').without_ensure
end
end
context 'with use_namespaces as false' do
before :each do
params.merge!(:use_namespaces => false)
end
it 'should set use_namespaces option' do
is_expected.to contain_neutron_lbaas_agent_config('DEFAULT/use_namespaces').with_value(p[:use_namespaces])
end
end
end
shared_examples_for 'haproxy lbaas_driver' do

10
spec/classes/neutron_agents_metering_spec.rb
View File

@@ -38,7 +38,6 @@ describe 'neutron::agents::metering' do
:debug => false,
:interface_driver => 'neutron.agent.linux.interface.OVSInterfaceDriver',
:driver => 'neutron.services.metering.drivers.noop.noop_driver.NoopMeteringDriver',
:use_namespaces => nil,
:purge_config => false,
}
end
@@ -101,15 +100,6 @@ describe 'neutron::agents::metering' do
end
end
context 'with use_namespaces as false' do
before :each do
params.merge!(:use_namespaces => false)
end
it 'should set use_namespaces option' do
is_expected.to contain_neutron_metering_agent_config('DEFAULT/use_namespaces').with_value(p[:use_namespaces])
end
end
context 'with non-default driver' do
before :each do
params.merge!(:driver => 'neutron.services.metering.drivers.iptables.iptables_driver.IptablesMeteringDriver')