From 01e72cbb9a0ab7310f2ac4f7a10caf880f86a41f Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Thu, 25 Aug 2022 15:53:06 +0900
Subject: [PATCH] Remove deprecated designate::neutron_network_type

The parameter was deprecated during Yoga cycle in favor of the separate
class to manage network_api:neutron parameters[1].

[1] 09a2c6b46c5ba02f8290904dca195329f2ebeafb

Change-Id: I31f52fcda46c33bf0163733aece4fd1279f63cc7
---
 manifests/init.pp                                   | 13 -------------
 manifests/network_api/neutron.pp                    |  4 +---
 ...move-neutron_endpoint_type-c33cb824621b4db4.yaml |  4 ++++
 spec/classes/designate_init_spec.rb                 | 11 +++--------
 4 files changed, 8 insertions(+), 24 deletions(-)
 create mode 100644 releasenotes/notes/remove-neutron_endpoint_type-c33cb824621b4db4.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index fa21f0fd..4ce7f8a0 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -106,12 +106,6 @@
 #   (optional) Whether to use durable queues in AMQP.
 #   Defaults to $::os_service_default.
 #
-# DEPRECATED PARAMETERS
-#
-# [*neutron_endpoint_type*]
-#   (optional) Endpoint type to use.
-#   Defaults to undef
-#
 class designate(
   $package_ensure              = present,
   $common_package_name         = $::designate::params::common_package_name,
@@ -134,17 +128,10 @@ class designate(
   $notification_topics         = 'notifications',
   $purge_config                = false,
   $amqp_durable_queues         = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $neutron_endpoint_type       = undef
 ) inherits designate::params {
 
   include designate::deps
 
-  if $neutron_endpoint_type != undef {
-    warning('The neutron_endpoint_type parameter is deprecated. Use the designate::network_api::neutron class.')
-  }
-  include designate::network_api::neutron
-
   package { 'designate-common':
     ensure => $package_ensure,
     name   => $common_package_name,
diff --git a/manifests/network_api/neutron.pp b/manifests/network_api/neutron.pp
index 9ade3462..d2956557 100644
--- a/manifests/network_api/neutron.pp
+++ b/manifests/network_api/neutron.pp
@@ -24,11 +24,9 @@ class designate::network_api::neutron (
   include designate::deps
   include designate::params
 
-  $endpoint_type_real = pick($::designate::neutron_endpoint_type, $endpoint_type)
-
   designate_config {
     'network_api:neutron/endpoints':     value => join(any2array($endpoints), ',');
-    'network_api:neutron/endpoint_type': value => $endpoint_type_real;
+    'network_api:neutron/endpoint_type': value => $endpoint_type;
     'network_api:neutron/timeout':       value => $timeout;
   }
 
diff --git a/releasenotes/notes/remove-neutron_endpoint_type-c33cb824621b4db4.yaml b/releasenotes/notes/remove-neutron_endpoint_type-c33cb824621b4db4.yaml
new file mode 100644
index 00000000..85a6122c
--- /dev/null
+++ b/releasenotes/notes/remove-neutron_endpoint_type-c33cb824621b4db4.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The ``designate::neutron_endpoint_type`` parameter has been removed.
diff --git a/spec/classes/designate_init_spec.rb b/spec/classes/designate_init_spec.rb
index 32e1b2e6..dfa4321a 100644
--- a/spec/classes/designate_init_spec.rb
+++ b/spec/classes/designate_init_spec.rb
@@ -7,10 +7,9 @@ describe 'designate' do
 
   let :params do
     {
-      :package_ensure        => 'installed',
-      :purge_config          => false,
-      :neutron_endpoint_type => 'internalURL',
-      :root_helper           => 'sudo designate-rootwrap /etc/designate/rootwrap.conf'
+      :package_ensure => 'installed',
+      :purge_config   => false,
+      :root_helper    => 'sudo designate-rootwrap /etc/designate/rootwrap.conf'
     }
   end
 
@@ -70,10 +69,6 @@ describe 'designate' do
       is_expected.to contain_designate_config('DEFAULT/root_helper').with_value( params[:root_helper] )
     end
 
-    it 'configures network endpoint type to use' do
-      is_expected.to contain_designate_config('network_api:neutron/endpoint_type').with_value( params[:neutron_endpoint_type] )
-    end
-
     it 'configures messaging' do
       is_expected.to contain_oslo__messaging__default('designate_config').with(
         :transport_url        => '<SERVICE DEFAULT>',