Remove deprecated service_provider parameter
This parameter has been deprecated for two years and does nothing. Lets remove it. Change-Id: I3416b68edb0dfaa4f8c291f756c28260dc7d364d
This commit is contained in:
parent
a0b03c521d
commit
dfb75a3cf6
@ -573,9 +573,6 @@
|
|||||||
#
|
#
|
||||||
# === DEPRECATED PARAMETERS
|
# === DEPRECATED PARAMETERS
|
||||||
#
|
#
|
||||||
# [*service_provider*]
|
|
||||||
# (optional) Deprecated. Provider, that can be used for keystone service.
|
|
||||||
#
|
|
||||||
# [*enable_pki_setup*]
|
# [*enable_pki_setup*]
|
||||||
# (optional) Deprecated. Enable call to pki_setup to generate the cert for signing pki tokens and
|
# (optional) Deprecated. Enable call to pki_setup to generate the cert for signing pki tokens and
|
||||||
# revocation lists if it doesn't already exist. This generates a cert and key stored in file
|
# revocation lists if it doesn't already exist. This generates a cert and key stored in file
|
||||||
@ -746,7 +743,6 @@ class keystone(
|
|||||||
# DEPRECATED PARAMETERS
|
# DEPRECATED PARAMETERS
|
||||||
$admin_workers = $::os_workers,
|
$admin_workers = $::os_workers,
|
||||||
$public_workers = $::os_workers,
|
$public_workers = $::os_workers,
|
||||||
$service_provider = undef,
|
|
||||||
$enable_pki_setup = undef,
|
$enable_pki_setup = undef,
|
||||||
$signing_certfile = $::os_service_default,
|
$signing_certfile = $::os_service_default,
|
||||||
$signing_keyfile = $::os_service_default,
|
$signing_keyfile = $::os_service_default,
|
||||||
@ -760,11 +756,6 @@ class keystone(
|
|||||||
include ::keystone::logging
|
include ::keystone::logging
|
||||||
include ::keystone::policy
|
include ::keystone::policy
|
||||||
|
|
||||||
if $service_provider {
|
|
||||||
warning("service_provider is deprecated, does nothing and will be removed in a future release, \
|
|
||||||
use a Puppet resource collector if you want to modify the service provider.")
|
|
||||||
}
|
|
||||||
|
|
||||||
if ! $catalog_driver {
|
if ! $catalog_driver {
|
||||||
validate_re($catalog_type, 'template|sql')
|
validate_re($catalog_type, 'template|sql')
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,4 @@
|
|||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The deprecated keystone::service_provider parameter is now removed.
|
Loading…
x
Reference in New Issue
Block a user