From 5732af782b3962ad44530919549d7d58d456689e Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sun, 26 Apr 2020 23:36:12 +0900
Subject: [PATCH] Cleanup deprecated service_instance_network_helper_type

... because it was deprecated quite a long ago[1].

[1] 5955b37b9b640e6ffdd7d4f4fa20677187b26ad7

Change-Id: Ibe99e25ddc1145d49229b5c2e32e016d63e9b476
---
 manifests/service_instance.pp                       | 13 -------------
 ...work_helper_type_parameter-574fa1d1f11ed47b.yaml |  5 +++++
 2 files changed, 5 insertions(+), 13 deletions(-)
 create mode 100644 releasenotes/notes/remove_service_instance_network_helper_type_parameter-574fa1d1f11ed47b.yaml

diff --git a/manifests/service_instance.pp b/manifests/service_instance.pp
index 94ca4a00..1e4aa5ec 100644
--- a/manifests/service_instance.pp
+++ b/manifests/service_instance.pp
@@ -75,12 +75,6 @@
 #   (optional) Attach share server directly to share network.
 #   Defaults to: false
 #
-# DEPRECATED PARAMETERS
-#
-# [*service_instance_network_helper_type*]
-# Allowed values are nova, neutron
-# Defaults to: undef
-
 define manila::service_instance (
   $create_service_image                   = true,
   $service_image_name                     = 'manila-service-image',
@@ -99,17 +93,10 @@ define manila::service_instance (
   $service_network_division_mask          = 28,
   $interface_driver                       = 'manila.network.linux.interface.OVSInterfaceDriver',
   $connect_share_server_to_tenant_network = false,
-  # DEPRECATED PARAMETERS
-  $service_instance_network_helper_type   = undef,
-
 ) {
 
   include manila::deps
 
-  if $service_instance_network_helper_type {
-    warning('service_instance_network_helper_type is deprecated, has no effect, and will be removed in the future.')
-  }
-
   if $create_service_image {
     if $service_image_location {
       glance_image { $service_image_name:
diff --git a/releasenotes/notes/remove_service_instance_network_helper_type_parameter-574fa1d1f11ed47b.yaml b/releasenotes/notes/remove_service_instance_network_helper_type_parameter-574fa1d1f11ed47b.yaml
new file mode 100644
index 00000000..0ddd0373
--- /dev/null
+++ b/releasenotes/notes/remove_service_instance_network_helper_type_parameter-574fa1d1f11ed47b.yaml
@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    The service_instance_network_helper_type parameter in
+    manila::service_instance class has been removed.