Remove deprecated parameters

Removes deprecated parameters that has been deprecated for one cycle or more. Change-Id: Idc6b8297f4c8a21d22acbd4740246af679e97a2c
openstack · Jun 19, 2018 · 59e2238 · 59e2238
1 parent a42a7ab
commit 59e2238
Show file tree

Hide file tree

Showing 20 changed files with 105 additions and 391 deletions.
diff --git a/README.md b/README.md
@@ -48,12 +48,10 @@ To utilize the neutron module's functionality you will need to declare multiple
 ```puppet
 # enable the neutron service
 class { '::neutron':
-    enabled         => true,
-    bind_host       => '127.0.0.1',
-    rabbit_host     => '127.0.0.1',
-    rabbit_user     => 'neutron',
-    rabbit_password => 'rabbit_secret',
-    debug           => false,
+    enabled               => true,
+    bind_host             => '127.0.0.1',
+    default_transport_url => 'rabbit://neutron:passw0rd@localhost:5672/neutron',
+    debug                 => false,
 }
 
 # configure authentication

diff --git a/examples/cisco_ml2.pp b/examples/cisco_ml2.pp
@@ -1,10 +1,8 @@
 class { '::neutron':
-  enabled         => true,
-  bind_host       => '127.0.0.1',
-  rabbit_host     => '127.0.0.1',
-  rabbit_user     => 'neutron',
-  rabbit_password => 'rabbit_secret',
-  debug           => true,
+  enabled               => true,
+  bind_host             => '127.0.0.1',
+  default_transport_url => 'rabbit://guest:password@localhost:5672/neutron',
+  debug                 => true,
 }
 
 class { '::neutron::server':

diff --git a/examples/neutron.pp b/examples/neutron.pp
@@ -4,9 +4,7 @@
 # Configures everything in neutron.conf
 class { '::neutron':
   allow_overlapping_ips => true,
-  rabbit_password       => 'password',
-  rabbit_user           => 'guest',
-  rabbit_host           => 'localhost',
+  default_transport_url => 'rabbit://guest:password@localhost:5672/neutron',
   service_plugins       => ['metering']
 }
 
@@ -50,9 +48,7 @@
 # over Rabbit and needs to know if overlapping IPs (namespaces) are in use
 class { '::neutron':
   allow_overlapping_ips => true,
-  rabbit_password       => 'password',
-  rabbit_user           => 'guest',
-  rabbit_host           => 'localhost',
+  default_transport_url => 'rabbit://guest:password@localhost:5672/neutron',
 }
 
 # The agent/plugin combo also needs installed on clients

diff --git a/examples/neutron_l3_with_to_uuid.pp b/examples/neutron_l3_with_to_uuid.pp
@@ -8,9 +8,7 @@
 
 class { '::neutron':
   allow_overlapping_ips => true,
-  rabbit_password       => 'password',
-  rabbit_user           => 'guest',
-  rabbit_host           => 'localhost',
+  default_transport_url => 'rabbit://guest:password@localhost:5672/neutron',
   service_plugins       => ['router']
 }
 

diff --git a/examples/neutron_wsgi.pp b/examples/neutron_wsgi.pp
@@ -1,9 +1,7 @@
 # Example of manifest to deploy Neutron API in WSGI with Apache
 class { '::neutron':
   allow_overlapping_ips => true,
-  rabbit_password       => 'password',
-  rabbit_user           => 'guest',
-  rabbit_host           => 'localhost',
+  default_transport_url => 'rabbit://guest:password@localhost:5672/neutron',
 }
 
 class { '::neutron::server':

diff --git a/manifests/agents/dhcp.pp b/manifests/agents/dhcp.pp
@@ -99,12 +99,6 @@
 # (optional) The SSL CA cert file to use for Neutron agents to connect to OVSDB
 # Defaults to $::os_service_default
 #
-# === Deprecated Parameters
-#
-# [*dhcp_domain*]
-#   (optional) Deprecated. Domain to use for building the hostnames
-#   Defaults to $::os_service_default
-#
 class neutron::agents::dhcp (
   $package_ensure            = present,
   $enabled                   = true,
@@ -129,8 +123,6 @@
   $ovsdb_agent_ssl_key_file  = $::os_service_default,
   $ovsdb_agent_ssl_cert_file = $::os_service_default,
   $ovsdb_agent_ssl_ca_file   = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $dhcp_domain               = $::os_service_default,
 ) {
 
   include ::neutron::deps
@@ -158,7 +150,6 @@
     'DEFAULT/state_path':             value => $state_path;
     'DEFAULT/resync_interval':        value => $resync_interval;
     'DEFAULT/interface_driver':       value => $interface_driver;
-    'DEFAULT/dhcp_domain':            value => $dhcp_domain;
     'DEFAULT/dhcp_driver':            value => $dhcp_driver;
     'DEFAULT/root_helper':            value => $root_helper;
     'DEFAULT/dhcp_broadcast_reply':   value => $dhcp_broadcast_reply;
@@ -169,10 +160,6 @@
     'AGENT/availability_zone':        value => $availability_zone;
   }
 
-  if ! is_service_default ($dhcp_domain) {
-    warning('The dhcp_domain parameter is deprecated and will be removed in future releases')
-  }
-
   if $ovsdb_connection =~ /^ssl:/ {
     $req_ssl_opts = {
       'ovsdb_agent_ssl_key_file'  => $ovsdb_agent_ssl_key_file,

diff --git a/manifests/agents/l3.pp b/manifests/agents/l3.pp
@@ -87,13 +87,6 @@
 #   (optional) L3 agent extensions to enable.
 #   Defaults to $::os_service_default
 #
-# == Deprecated
-#
-# [*send_arp_for_ha*]
-#   (deprecated) Send this many gratuitous ARPs for HA setup. Set it below or equal to 0
-#   to disable this feature.
-#   Defaults to $::os_service_default
-#
 class neutron::agents::l3 (
   $package_ensure                   = 'present',
   $enabled                          = true,
@@ -114,8 +107,6 @@
   $purge_config                     = false,
   $availability_zone                = $::os_service_default,
   $extensions                       = $::os_service_default,
-  # Deprecated
-  $send_arp_for_ha                  = $::os_service_default,
 ) {
 
   include ::neutron::deps
@@ -133,18 +124,12 @@
     }
   }
 
-  if !is_service_default($send_arp_for_ha) {
-    deprecation('send_arp_for_ha', 'The l3-agent configuration option \
-send_arp_for_ha is deprecated in ocata release, and will be removed in Pike')
-  }
-
   neutron_l3_agent_config {
     'DEFAULT/debug':                            value => $debug;
     '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;
     'DEFAULT/metadata_port':                    value => $metadata_port;
-    'DEFAULT/send_arp_for_ha':                  value => $send_arp_for_ha;
     'DEFAULT/periodic_interval':                value => $periodic_interval;
     'DEFAULT/periodic_fuzzy_delay':             value => $periodic_fuzzy_delay;
     'DEFAULT/enable_metadata_proxy':            value => $enable_metadata_proxy;

diff --git a/manifests/agents/ml2/ovs.pp b/manifests/agents/ml2/ovs.pp
@@ -150,12 +150,6 @@
 #  changes. (boolean value)
 #  Defaults to $::os_service_default
 #
-# === Deprecated Parameters
-#
-# [*enable_tunneling*]
-#   (optional) Enable or not tunneling
-#   Defaults to false
-#
 class neutron::agents::ml2::ovs (
   $package_ensure             = 'present',
   $enabled                    = true,
@@ -185,8 +179,6 @@
   $enable_dpdk                = false,
   $enable_security_group      = $::os_service_default,
   $minimize_polling           = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $enable_tunneling           = false,
 ) {
 
   include ::neutron::deps
@@ -212,22 +204,18 @@
     }
   }
 
-  if $enable_tunneling {
-    warning('The enable_tunneling parameter is deprecated.  Please set tunnel_types with the desired type to enable tunneling.')
-  }
-
   validate_array($tunnel_types)
-  if $enable_tunneling or (size($tunnel_types) > 0) {
-    $enable_tunneling_real = true
+  if size($tunnel_types) > 0 {
+    $enable_tunneling = true
   } else {
-    $enable_tunneling_real = false
+    $enable_tunneling = false
   }
 
-  if $enable_tunneling_real and ! $local_ip {
+  if $enable_tunneling and ! $local_ip {
     fail('Local ip for ovs agent must be set when tunneling is enabled')
   }
 
-  if ($enable_tunneling_real) and (!is_service_default($enable_distributed_routing)) and (!is_service_default($l2_population)) {
+  if ($enable_tunneling) and (!is_service_default($enable_distributed_routing)) and (!is_service_default($l2_population)) {
     if $enable_distributed_routing and ! $l2_population {
       fail('L2 population must be enabled when DVR and tunneling are enabled')
     }
@@ -296,7 +284,7 @@
     neutron_agent_ovs { 'securitygroup/firewall_driver': ensure => absent }
   }
 
-  if $enable_tunneling_real {
+  if $enable_tunneling {
     neutron_agent_ovs {
       'ovs/tunnel_bridge':         value => $tunnel_bridge;
       'ovs/local_ip':              value => $local_ip;

diff --git a/manifests/agents/vpnaas.pp b/manifests/agents/vpnaas.pp
@@ -38,35 +38,17 @@
 #   in the vpnaas config.
 #   Defaults to false.
 #
-# DEPRECATED PARAMETERS
-# [*enabled*]
-#   (optional) Enable state for service. Defaults to undef.
-#
-# [*manage_service*]
-#   (optional) Whether to start/stop the service
-#   Defaults to undef
 class neutron::agents::vpnaas (
   $package_ensure              = present,
   $vpn_device_driver           = 'neutron.services.vpn.device_drivers.ipsec.OpenSwanDriver',
   $interface_driver            = 'neutron.agent.linux.interface.OVSInterfaceDriver',
   $ipsec_status_check_interval = $::os_service_default,
   $purge_config                = false,
-  # DEPRECATED PARAMETERS
-  $enabled                     = undef,
-  $manage_service              = undef,
 ) {
 
   include ::neutron::deps
   include ::neutron::params
 
-  if $enabled{
-    warning ('enabled is deprecated, has no effect and will be removed in a future release.')
-  }
-
-  if $manage_service{
-    warning ('manage_service is deprecated, has no effect and will be removed in a future release.')
-  }
-
   case $vpn_device_driver {
     /\.OpenSwan/: {
       Package['openswan'] -> Package<| title == 'neutron-vpnaas-agent' |>

diff --git a/manifests/plugins/ml2.pp b/manifests/plugins/ml2.pp
@@ -127,13 +127,6 @@
 #   are 4 and 6.
 #   Defaults to $::os_service_default
 #
-# DEPRECATED PARAMETERS
-# [*supported_pci_vendor_devs*]
-#   (optional) Supported PCI vendor devices, defined by
-#   vendor_id:product_id according to the PCI ID
-#   Repository. Should be an array of devices.
-#   Defaults to undef
-#
 class neutron::plugins::ml2 (
   $type_drivers              = ['local', 'flat', 'vlan', 'gre', 'vxlan', 'geneve'],
   $extension_drivers         = $::os_service_default,
@@ -152,8 +145,6 @@
   $purge_config              = false,
   $max_header_size           = $::os_service_default,
   $overlay_ip_version        = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $supported_pci_vendor_devs = undef,
 ) {
 
   include ::neutron::deps
@@ -167,10 +158,6 @@
     warning('Security groups will not work without properly set firewall_driver')
   }
 
-  if $supported_pci_vendor_devs {
-    warning ('supported_pci_vendor_devs is deprecated, has no effect and will be removed in a future release.')
-  }
-
   if !is_service_default($overlay_ip_version) and !("${overlay_ip_version}" in ['4', '6']) {
     fail('Invalid IP version for overlay_ip_version')
   }

diff --git a/manifests/plugins/ovn.pp b/manifests/plugins/ovn.pp
diff --git a/manifests/quota.pp b/manifests/quota.pp
@@ -87,13 +87,6 @@
 #   A negative value means unlimited.
 #   Defaults to $::os_service_default.
 #
-#
-# DEPRECATED
-# [*quota_health_monitor*]
-#   (optional) Number of health monitors allowed per tenant.
-#   A negative value means unlimited.
-#   Defaults to undef
-#
 class neutron::quota (
   $default_quota             = $::os_service_default,
   $quota_network             = $::os_service_default,
@@ -116,19 +109,10 @@
   $quota_loadbalancer        = $::os_service_default,
   $quota_pool                = $::os_service_default,
   $quota_vip                 = $::os_service_default,
-  #DEPRECATED ARGS
-  $quota_health_monitor      = undef,
 ) {
 
   include ::neutron::deps
 
-  if $quota_health_monitor and is_service_default($quota_healthmonitor) {
-    warning('quota_health_monitor is deprecated, use quota_healthmonitor')
-    $quota_healthmonitor_real = $quota_health_monitor
-  } else {
-    $quota_healthmonitor_real = $quota_healthmonitor
-  }
-
   neutron_config {
     'quotas/default_quota':             value => $default_quota;
     'quotas/quota_network':             value => $quota_network;
@@ -142,7 +126,7 @@
     'quotas/quota_firewall':            value => $quota_firewall;
     'quotas/quota_firewall_policy':     value => $quota_firewall_policy;
     'quotas/quota_firewall_rule':       value => $quota_firewall_rule;
-    'quotas/quota_healthmonitor':       value => $quota_healthmonitor_real;
+    'quotas/quota_healthmonitor':       value => $quota_healthmonitor;
     'quotas/quota_member':              value => $quota_member;
     'quotas/quota_network_gateway':     value => $quota_network_gateway;
     'quotas/quota_packet_filter':       value => $quota_packet_filter;