From 18a4e46704df2cd83f407f6bee57de3922e926a1 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Fri, 20 May 2022 22:36:54 +0900
Subject: [PATCH] Remove use_neutron parameter

... because it was deprecated during Yoga cycle[1] and has had no
effect since then.

[1] ddb0f14f95156c483c499fe95982d2e5777b236f

Change-Id: Ib9eab7d3c174c11932afb05c66138dfe3cbf5a7c
---
 manifests/init.pp                               |  9 ---------
 .../remove-use_neutron-820b1a0eb3db454b.yaml    |  4 ++++
 spec/classes/trove_init_spec.rb                 | 17 ++++++++---------
 3 files changed, 12 insertions(+), 18 deletions(-)
 create mode 100644 releasenotes/notes/remove-use_neutron-820b1a0eb3db454b.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index ccd4c0ae..894dbb06 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -241,10 +241,6 @@
 #
 # DEPRECATED PARAMETERS
 #
-# [*use_neutron*]
-#   (optional) Use Neutron
-#   Defaults to undef
-#
 # [*database_connection*]
 #   (optional) Connection url to connect to trove database.
 #   Defaults to undef.
@@ -322,7 +318,6 @@ class trove(
   $default_neutron_networks     = $::os_service_default,
   $package_ensure               = 'present',
   # DEPRECATED PARAMETERS
-  $use_neutron                  = undef,
   $database_connection          = undef,
   $database_idle_timeout        = undef,
   $database_max_retries         = undef,
@@ -335,10 +330,6 @@ class trove(
   include trove::policy
   include trove::params
 
-  if $use_neutron != undef {
-    warning('The trove::use_neutron parameter has been deprecated and has no effect.')
-  }
-
   [
     'database_connection',
     'database_idle_timeout',
diff --git a/releasenotes/notes/remove-use_neutron-820b1a0eb3db454b.yaml b/releasenotes/notes/remove-use_neutron-820b1a0eb3db454b.yaml
new file mode 100644
index 00000000..3ffe4ff4
--- /dev/null
+++ b/releasenotes/notes/remove-use_neutron-820b1a0eb3db454b.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The ``trove::use_neutron`` parameter has been removed.
diff --git a/spec/classes/trove_init_spec.rb b/spec/classes/trove_init_spec.rb
index c374c2f5..d33b46a8 100644
--- a/spec/classes/trove_init_spec.rb
+++ b/spec/classes/trove_init_spec.rb
@@ -101,6 +101,11 @@ describe 'trove' do
           :tag    => ['openstack', 'trove-package'],
         )
       end
+
+      it 'configures trove to use the Neutron network driver' do
+        is_expected.to contain_trove_config('DEFAULT/network_label_regex').with_value('.*')
+        is_expected.to contain_trove_config('DEFAULT/network_driver').with_value('trove.network.neutron.NeutronDriver')
+      end
     end
 
     context 'with single tenant mode enabled' do
@@ -115,19 +120,13 @@ describe 'trove' do
       end
     end
 
-    context 'when using Neutron' do
+    context 'with default networks' do
       let :params do
-        { :use_neutron              => true,
-          :default_neutron_networks => 'trove_service' }
+        { :default_neutron_networks => 'trove_service' }
       end
 
-      it 'configures trove to use the Neutron network driver' do
+      it 'configures default networks' do
         is_expected.to contain_trove_config('DEFAULT/default_neutron_networks').with_value('trove_service')
-        is_expected.to contain_trove_config('DEFAULT/network_driver').with_value('trove.network.neutron.NeutronDriver')
-      end
-
-      it 'configures trove to use any network label' do
-        is_expected.to contain_trove_config('DEFAULT/network_label_regex').with_value('.*')
       end
     end
   end