Remove deprecated pki related options
The deprecated pki related options check_revocations_for_cached and hash_algorithms option has been removed. Change-Id: I6bcfc33a6371b7f81e3bdd5fb77f3e8123d90ce3
This commit is contained in:
		| @@ -166,25 +166,6 @@ | |||||||
| #   true/false | #   true/false | ||||||
| #   Defaults to $::os_service_default. | #   Defaults to $::os_service_default. | ||||||
| # | # | ||||||
| # DEPRECATED PARAMETERS |  | ||||||
| # |  | ||||||
| # [*check_revocations_for_cached*] |  | ||||||
| #   (Optional) If true, the revocation list will be checked for cached tokens. |  | ||||||
| #   This requires that PKI tokens are configured on the identity server. |  | ||||||
| #   boolean value. |  | ||||||
| #   Defaults to undef. |  | ||||||
| # |  | ||||||
| # [*hash_algorithms*] |  | ||||||
| #   (Optional) Hash algorithms to use for hashing PKI tokens. This may be a |  | ||||||
| #   single algorithm or multiple. The algorithms are those supported by Python |  | ||||||
| #   standard hashlib.new(). The hashes will be tried in the order given, so put |  | ||||||
| #   the preferred one first for performance. The result of the first hash will |  | ||||||
| #   be stored in the cache. This will typically be set to multiple values only |  | ||||||
| #   while migrating from a less secure algorithm to a more secure one. Once all |  | ||||||
| #   the old tokens are expired this option should be set to a single value for |  | ||||||
| #   better performance. List value. |  | ||||||
| #   Defaults to undef. |  | ||||||
| # |  | ||||||
| class cloudkitty::keystone::authtoken( | class cloudkitty::keystone::authtoken( | ||||||
|   $password, |   $password, | ||||||
|   $username                       = 'cloudkitty', |   $username                       = 'cloudkitty', | ||||||
| @@ -219,21 +200,10 @@ class cloudkitty::keystone::authtoken( | |||||||
|   $region_name                    = $::os_service_default, |   $region_name                    = $::os_service_default, | ||||||
|   $token_cache_time               = $::os_service_default, |   $token_cache_time               = $::os_service_default, | ||||||
|   $service_token_roles_required   = $::os_service_default, |   $service_token_roles_required   = $::os_service_default, | ||||||
|   # DEPRECATED PARAMETERS |  | ||||||
|   $check_revocations_for_cached   = undef, |  | ||||||
|   $hash_algorithms                = undef, |  | ||||||
| ) { | ) { | ||||||
|  |  | ||||||
|   include ::cloudkitty::deps |   include ::cloudkitty::deps | ||||||
|  |  | ||||||
|   if $check_revocations_for_cached { |  | ||||||
|     warning('check_revocations_for_cached parameter is deprecated, has no effect and will be removed in the future.') |  | ||||||
|   } |  | ||||||
|  |  | ||||||
|   if $hash_algorithms { |  | ||||||
|     warning('hash_algorithms parameter is deprecated, has no effect and will be removed in the future.') |  | ||||||
|   } |  | ||||||
|  |  | ||||||
|   keystone::resource::authtoken { 'cloudkitty_config': |   keystone::resource::authtoken { 'cloudkitty_config': | ||||||
|     username                       => $username, |     username                       => $username, | ||||||
|     password                       => $password, |     password                       => $password, | ||||||
|   | |||||||
| @@ -0,0 +1,5 @@ | |||||||
|  | --- | ||||||
|  | upgrade: | ||||||
|  |   - | | ||||||
|  |     The deprecated pki related options check_revocations_for_cached and | ||||||
|  |     hash_algorithms option has been removed. | ||||||
		Reference in New Issue
	
	Block a user
	 ZhongShengping
					ZhongShengping