Validate ensure parameter for package resources
The minimum version of puppetlabs-stdlib has been bumped globally, so now we can use the common type definition. Change-Id: Ica54ea2cb00ac7f8701ce802537aa53fea3ceb73 Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
@@ -94,7 +94,7 @@ class keystone::federation::identity_provider (
|
|||||||
$idp_contact_email = $facts['os_service_default'],
|
$idp_contact_email = $facts['os_service_default'],
|
||||||
$idp_contact_telephone = $facts['os_service_default'],
|
$idp_contact_telephone = $facts['os_service_default'],
|
||||||
$idp_contact_type = $facts['os_service_default'],
|
$idp_contact_type = $facts['os_service_default'],
|
||||||
$package_ensure = present,
|
Stdlib::Ensure::Package $package_ensure = present,
|
||||||
) inherits keystone::params {
|
) inherits keystone::params {
|
||||||
include keystone::deps
|
include keystone::deps
|
||||||
|
|
||||||
|
|||||||
@@ -388,7 +388,7 @@
|
|||||||
#
|
#
|
||||||
class keystone (
|
class keystone (
|
||||||
Boolean $manage_package = true,
|
Boolean $manage_package = true,
|
||||||
$package_ensure = 'present',
|
Stdlib::Ensure::Package $package_ensure = present,
|
||||||
$catalog_driver = $facts['os_service_default'],
|
$catalog_driver = $facts['os_service_default'],
|
||||||
$token_provider = 'fernet',
|
$token_provider = 'fernet',
|
||||||
$token_expiration = 3600,
|
$token_expiration = 3600,
|
||||||
|
|||||||
@@ -220,16 +220,16 @@
|
|||||||
# End user auth connection lifetime in seconds. (integer value)
|
# End user auth connection lifetime in seconds. (integer value)
|
||||||
# Defaults to $facts['os_service_default']
|
# Defaults to $facts['os_service_default']
|
||||||
#
|
#
|
||||||
# [*package_ensure*]
|
|
||||||
# (optional) Desired ensure state of packages.
|
|
||||||
# accepts latest or specific versions.
|
|
||||||
# Defaults to present.
|
|
||||||
#
|
|
||||||
# [*manage_packages*]
|
# [*manage_packages*]
|
||||||
# (optional) Whether or not this module should manage
|
# (optional) Whether or not this module should manage
|
||||||
# LDAP support packages.
|
# LDAP support packages.
|
||||||
# Defaults to true.
|
# Defaults to true.
|
||||||
#
|
#
|
||||||
|
# [*package_ensure*]
|
||||||
|
# (optional) Desired ensure state of packages.
|
||||||
|
# accepts latest or specific versions.
|
||||||
|
# Defaults to present.
|
||||||
|
#
|
||||||
# == Authors
|
# == Authors
|
||||||
#
|
#
|
||||||
# Dan Bode dan@puppetlabs.com
|
# Dan Bode dan@puppetlabs.com
|
||||||
@@ -289,8 +289,8 @@ class keystone::ldap (
|
|||||||
$use_auth_pool = $facts['os_service_default'],
|
$use_auth_pool = $facts['os_service_default'],
|
||||||
$auth_pool_size = $facts['os_service_default'],
|
$auth_pool_size = $facts['os_service_default'],
|
||||||
$auth_pool_connection_lifetime = $facts['os_service_default'],
|
$auth_pool_connection_lifetime = $facts['os_service_default'],
|
||||||
$package_ensure = present,
|
|
||||||
Boolean $manage_packages = true,
|
Boolean $manage_packages = true,
|
||||||
|
Stdlib::Ensure::Package $package_ensure = present,
|
||||||
) inherits keystone::params {
|
) inherits keystone::params {
|
||||||
include keystone::deps
|
include keystone::deps
|
||||||
|
|
||||||
|
|||||||
@@ -231,16 +231,16 @@
|
|||||||
# End user auth connection lifetime in seconds. (integer value)
|
# End user auth connection lifetime in seconds. (integer value)
|
||||||
# Defaults to $facts['os_service_default']
|
# Defaults to $facts['os_service_default']
|
||||||
#
|
#
|
||||||
# [*package_ensure*]
|
|
||||||
# (optional) Desired ensure state of packages.
|
|
||||||
# accepts latest or specific versions.
|
|
||||||
# Defaults to present.
|
|
||||||
#
|
|
||||||
# [*manage_packages*]
|
# [*manage_packages*]
|
||||||
# (optional) Whether or not this module should manage
|
# (optional) Whether or not this module should manage
|
||||||
# LDAP support packages.
|
# LDAP support packages.
|
||||||
# Defaults to true.
|
# Defaults to true.
|
||||||
#
|
#
|
||||||
|
# [*package_ensure*]
|
||||||
|
# (optional) Desired ensure state of packages.
|
||||||
|
# accepts latest or specific versions.
|
||||||
|
# Defaults to present.
|
||||||
|
#
|
||||||
# [*create_domain_entry*]
|
# [*create_domain_entry*]
|
||||||
# (optional) Creates the domain in keystone via a keystone_domain resource
|
# (optional) Creates the domain in keystone via a keystone_domain resource
|
||||||
# and attempts to refresh the keystone service.
|
# and attempts to refresh the keystone service.
|
||||||
@@ -299,8 +299,8 @@ define keystone::ldap_backend (
|
|||||||
$use_auth_pool = $facts['os_service_default'],
|
$use_auth_pool = $facts['os_service_default'],
|
||||||
$auth_pool_size = $facts['os_service_default'],
|
$auth_pool_size = $facts['os_service_default'],
|
||||||
$auth_pool_connection_lifetime = $facts['os_service_default'],
|
$auth_pool_connection_lifetime = $facts['os_service_default'],
|
||||||
$package_ensure = present,
|
|
||||||
Boolean $manage_packages = true,
|
Boolean $manage_packages = true,
|
||||||
|
Stdlib::Ensure::Package $package_ensure = present,
|
||||||
Boolean $create_domain_entry = false,
|
Boolean $create_domain_entry = false,
|
||||||
) {
|
) {
|
||||||
include keystone::deps
|
include keystone::deps
|
||||||
|
|||||||
Reference in New Issue
Block a user