From e701669ba97652f0ba42cdb09e9387003bf4e4ac Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Sat, 20 Apr 2024 17:44:13 +0900
Subject: [PATCH] Remove config_file_path

This parameter was deprecated during the previous cycle[1] and has had
no effect.

[1] bb656e5ee8ceb8bc32889cfe1abe836b99386105

Change-Id: I6fd0ddaa526b8abdc5f48ce6586435c845af17be
---
 manifests/storage/server.pp                         | 13 -------------
 .../remove-config_file_path-b7cbcff8d732ad9e.yaml   |  5 +++++
 2 files changed, 5 insertions(+), 13 deletions(-)
 create mode 100644 releasenotes/notes/remove-config_file_path-b7cbcff8d732ad9e.yaml

diff --git a/manifests/storage/server.pp b/manifests/storage/server.pp
index 06d4db4d..5c017629 100644
--- a/manifests/storage/server.pp
+++ b/manifests/storage/server.pp
@@ -277,13 +277,6 @@
 #   in the config file.
 #   Defaults to false.
 #
-# DEPRECATED PARAMETERS
-#
-# [*config_file_path*]
-#   (optional) The configuration file name.
-#   Starting at the path "/etc/swift/"
-#   Defaults to undef
-#
 define swift::storage::server(
   Swift::StorageServerType $type,
   $storage_local_net_ip,
@@ -351,17 +344,11 @@ define swift::storage::server(
   $container_sharder_conn_timeout                        = $facts['os_service_default'],
   $container_sharder_node_timeout                        = $facts['os_service_default'],
   Boolean $purge_config                                  = false,
-  # DEPRECATED PARAMETERS
-  $config_file_path                                      = undef,
 ){
 
   include swift::deps
   include swift::params
 
-  if $config_file_path != undef {
-    warning('The config_file_path parameter is deprecated and has no effect')
-  }
-
   $user_real = pick($user, $::swift::params::user)
 
   # Fail if ${type-server} isn't included in the pipeline
diff --git a/releasenotes/notes/remove-config_file_path-b7cbcff8d732ad9e.yaml b/releasenotes/notes/remove-config_file_path-b7cbcff8d732ad9e.yaml
new file mode 100644
index 00000000..20e054fa
--- /dev/null
+++ b/releasenotes/notes/remove-config_file_path-b7cbcff8d732ad9e.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The ``swift::storage::server::config_file_path`` parameter has been
+    removed.