From 610de6e98d4d92815cf77645bf38c14fa0c346e7 Mon Sep 17 00:00:00 2001
From: Brent Eagles <beagles@redhat.com>
Date: Fri, 29 Jul 2016 14:48:33 -0230
Subject: [PATCH] Remove network_device_mtu

network_device_mtu was deprecated in mitaka  and has now been completely
removed from neutron for newton. This patch removes all references.

Depends-On: I4092a2f75691a0030f7ca4d18da3bfd7aeac1adc
Change-Id: I1cdeb9012a41a7232aaebe9407408dd8dc2a5f45
---
 manifests/init.pp                                    |  9 +--------
 ...n_remove_deprecated_options-772c33dec894edb1.yaml |  1 +
 spec/classes/neutron_init_spec.rb                    | 12 ------------
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index c30c8bc83..6c0ff3055 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -361,8 +361,6 @@
 #
 # DEPRECATED PARAMETERS
 #
-# [*network_device_mtu*]
-#
 # [*verbose*]
 #   (optional) Deprecated. Verbose logging
 #   Defaults to undef
@@ -456,7 +454,6 @@ class neutron (
   $notification_topics                  = $::os_service_default,
   $notification_transport_url           = $::os_service_default,
   # DEPRECATED PARAMETERS
-  $network_device_mtu                   = undef,
   $verbose                              = undef,
   $log_facility                         = undef,
   $advertise_mtu                        = undef,
@@ -534,7 +531,7 @@ class neutron (
     'DEFAULT/allow_overlapping_ips':   value => $allow_overlapping_ips;
     'DEFAULT/api_extensions_path':     value => $api_extensions_path;
     'DEFAULT/state_path':              value => $state_path;
-    'DEFAULT/global_physnet_mtu':      value => pick($network_device_mtu, $global_physnet_mtu);
+    'DEFAULT/global_physnet_mtu':      value => $global_physnet_mtu;
     'agent/root_helper':               value => $root_helper;
     'agent/root_helper_daemon':        value => $root_helper_daemon;
     'agent/report_interval':           value => $report_interval;
@@ -624,10 +621,6 @@ class neutron (
     }
   }
 
-  if $network_device_mtu {
-    warning('The neutron::network_device_mtu parameter is deprecated, use neutron::global_physnet_mtu instead.')
-  }
-
   # SSL Options
   neutron_config {
     'DEFAULT/use_ssl': value => $use_ssl;
diff --git a/releasenotes/notes/newton_remove_deprecated_options-772c33dec894edb1.yaml b/releasenotes/notes/newton_remove_deprecated_options-772c33dec894edb1.yaml
index 93d5c3472..864ae43a8 100644
--- a/releasenotes/notes/newton_remove_deprecated_options-772c33dec894edb1.yaml
+++ b/releasenotes/notes/newton_remove_deprecated_options-772c33dec894edb1.yaml
@@ -9,3 +9,4 @@ other:
     * 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
+  - Remove all other references to network_device_mtu
diff --git a/spec/classes/neutron_init_spec.rb b/spec/classes/neutron_init_spec.rb
index fcaa8b513..3a32077b9 100644
--- a/spec/classes/neutron_init_spec.rb
+++ b/spec/classes/neutron_init_spec.rb
@@ -441,18 +441,6 @@ describe 'neutron' do
     end
   end
 
-  shared_examples_for 'with deprecated network_device_mtu defined' do
-    before do
-      params.merge!(
-        :network_device_mtu => 9000
-      )
-    end
-
-    it do
-      is_expected.to contain_neutron_config('DEFAULT/global_physnet_mtu').with_value(params[:network_device_mtu])
-    end
-  end
-
   shared_examples_for 'with host defined' do
     before do
       params.merge!(