Remove config_file_path
This parameter was deprecated during the previous cycle[1] and has had
no effect.
[1] bb656e5ee8
Change-Id: I6fd0ddaa526b8abdc5f48ce6586435c845af17be
			
			
This commit is contained in:
		@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -0,0 +1,5 @@
 | 
			
		||||
---
 | 
			
		||||
upgrade:
 | 
			
		||||
  - |
 | 
			
		||||
    The ``swift::storage::server::config_file_path`` parameter has been
 | 
			
		||||
    removed.
 | 
			
		||||
		Reference in New Issue
	
	Block a user