From ff16bee10a982cea38d82e38965178e9dc94ce3f Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Tue, 8 Feb 2022 22:05:29 +0900
Subject: [PATCH] Remove some deprecated database parameters left

This is follow-up of c543bd33ae2389e64f932441c719fcc105a2f2da and
removes some deprecated database parameters still left.

Change-Id: I6325c5d8d290bf6176d17e4aea9058f85feea2f3
---
 manifests/db.pp                                   |  8 --------
 manifests/init.pp                                 |  5 -----
 .../remove-database-params-f7bcf4be24f64a78.yaml  |  1 +
 spec/classes/heat_api_cfn_spec.rb                 | 15 ---------------
 spec/classes/heat_api_spec.rb                     | 15 ---------------
 5 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/manifests/db.pp b/manifests/db.pp
index 6a129c98..05906107 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -47,12 +47,6 @@
 #   (Optional) Run db sync on nodes after connection setting has been set.
 #   Defaults to true
 #
-# DEPRECATED PARAMETERS
-#
-# [*database_min_pool_size*]
-#   Minimum number of SQL connections to keep open in a pool.
-#   (Optional) Defaults to undef
-#
 class heat::db (
   $database_connection              = 'sqlite:////var/lib/heat/heat.sqlite',
   $database_connection_recycle_time = $::os_service_default,
@@ -64,8 +58,6 @@ class heat::db (
   $mysql_enable_ndb                 = $::os_service_default,
   $database_db_max_retries          = $::os_service_default,
   $sync_db                          = true,
-  # DEPRECATED PARAMETERS
-  $database_min_pool_size           = undef,
 ) {
 
   include heat::deps
diff --git a/manifests/init.pp b/manifests/init.pp
index 979aaded..b94a01c4 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -208,10 +208,6 @@
 #   (Optional) Enable the stack-abandon feature.
 #   Defaults to $::os_service_default.
 #
-# [*sync_db*]
-#   (Optional) Run db sync on nodes after connection setting has been set.
-#   Defaults to undef
-#
 # [*enable_proxy_headers_parsing*]
 #   (Optional) Enable paste middleware to handle SSL requests through
 #   HTTPProxyToWSGI middleware.
@@ -311,7 +307,6 @@ class heat(
   $yaql_memory_quota                  = $::os_service_default,
   $yaql_limit_iterators               = $::os_service_default,
   # DEPRECATED PARAMETERS
-  $sync_db                            = undef,
   $amqp_allow_insecure_clients        = undef,
   $max_stacks_per_tenant              = undef,
 ) {
diff --git a/releasenotes/notes/remove-database-params-f7bcf4be24f64a78.yaml b/releasenotes/notes/remove-database-params-f7bcf4be24f64a78.yaml
index 6645c11a..773e15fb 100644
--- a/releasenotes/notes/remove-database-params-f7bcf4be24f64a78.yaml
+++ b/releasenotes/notes/remove-database-params-f7bcf4be24f64a78.yaml
@@ -10,6 +10,7 @@ upgrade:
     - ``database_max_pool_size``
     - ``database_max_retries``
     - ``database_retry_interval``
+    - ``sync_db``
 
   - |
     The ``database_min_pool_size`` parameter of the ``heat::db`` class has been
diff --git a/spec/classes/heat_api_cfn_spec.rb b/spec/classes/heat_api_cfn_spec.rb
index e02fd5fa..750288d5 100644
--- a/spec/classes/heat_api_cfn_spec.rb
+++ b/spec/classes/heat_api_cfn_spec.rb
@@ -88,21 +88,6 @@ describe 'heat::api_cfn' do
       end
     end
 
-    context 'with $sync_db set to false in ::heat' do
-      let :pre_condition do
-        "class { 'heat::keystone::authtoken':
-           password => 'a_big_secret',
-         }
-         class {'heat':
-           sync_db => false
-         }"
-      end
-
-      it 'configures heat-api-cfn service to not subscribe to the dbsync resource' do
-        is_expected.to contain_service('heat-api-cfn').that_subscribes_to(nil)
-      end
-    end
-
   end
 
   on_supported_os({
diff --git a/spec/classes/heat_api_spec.rb b/spec/classes/heat_api_spec.rb
index 9727da21..78572af1 100644
--- a/spec/classes/heat_api_spec.rb
+++ b/spec/classes/heat_api_spec.rb
@@ -87,21 +87,6 @@ describe 'heat::api' do
         is_expected.to_not contain_service('heat-api')
       end
     end
-
-    context 'with $sync_db set to false in ::heat' do
-      let :pre_condition do
-        "class { 'heat::keystone::authtoken':
-           password => 'a_big_secret',
-         }
-         class {'heat':
-           sync_db => false,
-         }"
-      end
-
-      it 'configures heat-api service to not subscribe to the dbsync resource' do
-        is_expected.to contain_service('heat-api').that_subscribes_to(nil)
-      end
-    end
   end
 
   on_supported_os({