openstack/puppet-swift
Code Issues Proposed changes

Merge "Remove config_file_path"

Browse Source
This commit is contained in:
Zuul 2024-04-25 15:37:21 +00:00 committed by Gerrit Code Review
commit b5905818ca
2 changed files with 5 additions and 13 deletions

13
manifests/storage/server.pp

@ -277,13 +277,6 @@
# in the config file. # in the config file.
# Defaults to false. # 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( define swift::storage::server(
Swift::StorageServerType $type, Swift::StorageServerType $type,
$storage_local_net_ip, $storage_local_net_ip,
@ -351,17 +344,11 @@ define swift::storage::server(
$container_sharder_conn_timeout = $facts['os_service_default'], $container_sharder_conn_timeout = $facts['os_service_default'],
$container_sharder_node_timeout = $facts['os_service_default'], $container_sharder_node_timeout = $facts['os_service_default'],
Boolean $purge_config = false, Boolean $purge_config = false,
# DEPRECATED PARAMETERS
$config_file_path = undef,
){ ){
include swift::deps include swift::deps
include swift::params 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) $user_real = pick($user, $::swift::params::user)
# Fail if ${type-server} isn't included in the pipeline # Fail if ${type-server} isn't included in the pipeline

5
releasenotes/notes/remove-config_file_path-b7cbcff8d732ad9e.yaml Normal file

@ -0,0 +1,5 @@
---
upgrade:
- |
The ``swift::storage::server::config_file_path`` parameter has been
removed.