openstack/puppet-keystone
Code Issues Proposed changes

Validate ensure parameter for package resources

Browse Source 
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:
Takashi Kajinami
2025-09-23 17:30:53 +09:00
parent 7e364bc54e
commit 22c1e471d5
4 changed files with 126 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
manifests/federation/identity_provider.pp
View File

@@ -82,19 +82,19 @@ class keystone::federation::identity_provider (
$idp_entity_id,
$idp_sso_endpoint,
Stdlib::Absolutepath $idp_metadata_path,
$certfile = $facts['os_service_default'],
$keyfile = $facts['os_service_default'],
$user = $keystone::params::user,
$idp_organization_name = $facts['os_service_default'],
$idp_organization_display_name = $facts['os_service_default'],
$idp_organization_url = $facts['os_service_default'],
$idp_contact_company = $facts['os_service_default'],
$idp_contact_name = $facts['os_service_default'],
$idp_contact_surname = $facts['os_service_default'],
$idp_contact_email = $facts['os_service_default'],
$idp_contact_telephone = $facts['os_service_default'],
$idp_contact_type = $facts['os_service_default'],
$package_ensure = present,
$certfile = $facts['os_service_default'],
$keyfile = $facts['os_service_default'],
$user = $keystone::params::user,
$idp_organization_name = $facts['os_service_default'],
$idp_organization_display_name = $facts['os_service_default'],
$idp_organization_url = $facts['os_service_default'],
$idp_contact_company = $facts['os_service_default'],
$idp_contact_name = $facts['os_service_default'],
$idp_contact_surname = $facts['os_service_default'],
$idp_contact_email = $facts['os_service_default'],
$idp_contact_telephone = $facts['os_service_default'],
$idp_contact_type = $facts['os_service_default'],
Stdlib::Ensure::Package $package_ensure = present,
) inherits keystone::params {
include keystone::deps

2
manifests/init.pp
View File

@@ -388,7 +388,7 @@
#
class keystone (
Boolean $manage_package = true,
$package_ensure = 'present',
Stdlib::Ensure::Package $package_ensure = present,
$catalog_driver = $facts['os_service_default'],
$token_provider = 'fernet',
$token_expiration = 3600,

108
manifests/ldap.pp
View File

@@ -220,16 +220,16 @@
# End user auth connection lifetime in seconds. (integer value)
# Defaults to $facts['os_service_default']
#
# [*package_ensure*]
# (optional) Desired ensure state of packages.
# accepts latest or specific versions.
# Defaults to present.
#
# [*manage_packages*]
# (optional) Whether or not this module should manage
# LDAP support packages.
# Defaults to true.
#
# [*package_ensure*]
# (optional) Desired ensure state of packages.
# accepts latest or specific versions.
# Defaults to present.
#
# == Authors
#
# Dan Bode dan@puppetlabs.com
@@ -240,57 +240,57 @@
# Copyright 2012 Puppetlabs Inc, unless otherwise noted.
#
class keystone::ldap (
$url = $facts['os_service_default'],
$user = $facts['os_service_default'],
$password = $facts['os_service_default'],
$suffix = $facts['os_service_default'],
$query_scope = $facts['os_service_default'],
$page_size = $facts['os_service_default'],
$user_tree_dn = $facts['os_service_default'],
$user_filter = $facts['os_service_default'],
$user_objectclass = $facts['os_service_default'],
$user_id_attribute = $facts['os_service_default'],
$user_name_attribute = $facts['os_service_default'],
$user_description_attribute = $facts['os_service_default'],
$user_mail_attribute = $facts['os_service_default'],
$user_enabled_attribute = $facts['os_service_default'],
$user_enabled_mask = $facts['os_service_default'],
$user_enabled_default = $facts['os_service_default'],
$user_enabled_invert = $facts['os_service_default'],
$user_attribute_ignore = $facts['os_service_default'],
$user_default_project_id_attribute = $facts['os_service_default'],
$user_pass_attribute = $facts['os_service_default'],
$user_enabled_emulation = $facts['os_service_default'],
$user_enabled_emulation_dn = $facts['os_service_default'],
$user_additional_attribute_mapping = $facts['os_service_default'],
$group_tree_dn = $facts['os_service_default'],
$group_filter = $facts['os_service_default'],
$group_objectclass = $facts['os_service_default'],
$group_id_attribute = $facts['os_service_default'],
$group_name_attribute = $facts['os_service_default'],
$group_member_attribute = $facts['os_service_default'],
$group_members_are_ids = $facts['os_service_default'],
$group_desc_attribute = $facts['os_service_default'],
$group_attribute_ignore = $facts['os_service_default'],
$group_additional_attribute_mapping = $facts['os_service_default'],
$chase_referrals = $facts['os_service_default'],
$use_tls = $facts['os_service_default'],
$url = $facts['os_service_default'],
$user = $facts['os_service_default'],
$password = $facts['os_service_default'],
$suffix = $facts['os_service_default'],
$query_scope = $facts['os_service_default'],
$page_size = $facts['os_service_default'],
$user_tree_dn = $facts['os_service_default'],
$user_filter = $facts['os_service_default'],
$user_objectclass = $facts['os_service_default'],
$user_id_attribute = $facts['os_service_default'],
$user_name_attribute = $facts['os_service_default'],
$user_description_attribute = $facts['os_service_default'],
$user_mail_attribute = $facts['os_service_default'],
$user_enabled_attribute = $facts['os_service_default'],
$user_enabled_mask = $facts['os_service_default'],
$user_enabled_default = $facts['os_service_default'],
$user_enabled_invert = $facts['os_service_default'],
$user_attribute_ignore = $facts['os_service_default'],
$user_default_project_id_attribute = $facts['os_service_default'],
$user_pass_attribute = $facts['os_service_default'],
$user_enabled_emulation = $facts['os_service_default'],
$user_enabled_emulation_dn = $facts['os_service_default'],
$user_additional_attribute_mapping = $facts['os_service_default'],
$group_tree_dn = $facts['os_service_default'],
$group_filter = $facts['os_service_default'],
$group_objectclass = $facts['os_service_default'],
$group_id_attribute = $facts['os_service_default'],
$group_name_attribute = $facts['os_service_default'],
$group_member_attribute = $facts['os_service_default'],
$group_members_are_ids = $facts['os_service_default'],
$group_desc_attribute = $facts['os_service_default'],
$group_attribute_ignore = $facts['os_service_default'],
$group_additional_attribute_mapping = $facts['os_service_default'],
$chase_referrals = $facts['os_service_default'],
$use_tls = $facts['os_service_default'],
Variant[Openstacklib::ServiceDefault, Stdlib::Absolutepath] $tls_cacertdir
= $facts['os_service_default'],
$tls_cacertfile = $facts['os_service_default'],
$tls_req_cert = $facts['os_service_default'],
$connection_timeout = $facts['os_service_default'],
$use_pool = $facts['os_service_default'],
$pool_size = $facts['os_service_default'],
$pool_retry_max = $facts['os_service_default'],
$pool_retry_delay = $facts['os_service_default'],
$pool_connection_timeout = $facts['os_service_default'],
$pool_connection_lifetime = $facts['os_service_default'],
$use_auth_pool = $facts['os_service_default'],
$auth_pool_size = $facts['os_service_default'],
$auth_pool_connection_lifetime = $facts['os_service_default'],
$package_ensure = present,
Boolean $manage_packages = true,
$tls_cacertfile = $facts['os_service_default'],
$tls_req_cert = $facts['os_service_default'],
$connection_timeout = $facts['os_service_default'],
$use_pool = $facts['os_service_default'],
$pool_size = $facts['os_service_default'],
$pool_retry_max = $facts['os_service_default'],
$pool_retry_delay = $facts['os_service_default'],
$pool_connection_timeout = $facts['os_service_default'],
$pool_connection_lifetime = $facts['os_service_default'],
$use_auth_pool = $facts['os_service_default'],
$auth_pool_size = $facts['os_service_default'],
$auth_pool_connection_lifetime = $facts['os_service_default'],
Boolean $manage_packages = true,
Stdlib::Ensure::Package $package_ensure = present,
) inherits keystone::params {
include keystone::deps

116
manifests/ldap_backend.pp
View File

@@ -231,16 +231,16 @@
# End user auth connection lifetime in seconds. (integer value)
# Defaults to $facts['os_service_default']
#
# [*package_ensure*]
# (optional) Desired ensure state of packages.
# accepts latest or specific versions.
# Defaults to present.
#
# [*manage_packages*]
# (optional) Whether or not this module should manage
# LDAP support packages.
# Defaults to true.
#
# [*package_ensure*]
# (optional) Desired ensure state of packages.
# accepts latest or specific versions.
# Defaults to present.
#
# [*create_domain_entry*]
# (optional) Creates the domain in keystone via a keystone_domain resource
# and attempts to refresh the keystone service.
@@ -249,59 +249,59 @@
# == Dependencies
# == Examples
define keystone::ldap_backend (
$url = $facts['os_service_default'],
$user = $facts['os_service_default'],
$password = $facts['os_service_default'],
$suffix = $facts['os_service_default'],
$query_scope = $facts['os_service_default'],
$page_size = $facts['os_service_default'],
$user_tree_dn = $facts['os_service_default'],
$user_filter = $facts['os_service_default'],
$user_objectclass = $facts['os_service_default'],
$user_id_attribute = $facts['os_service_default'],
$user_name_attribute = $facts['os_service_default'],
$user_description_attribute = $facts['os_service_default'],
$user_mail_attribute = $facts['os_service_default'],
$user_enabled_attribute = $facts['os_service_default'],
$user_enabled_mask = $facts['os_service_default'],
$user_enabled_default = $facts['os_service_default'],
$user_enabled_invert = $facts['os_service_default'],
$user_attribute_ignore = $facts['os_service_default'],
$user_default_project_id_attribute = $facts['os_service_default'],
$user_pass_attribute = $facts['os_service_default'],
$user_enabled_emulation = $facts['os_service_default'],
$user_enabled_emulation_dn = $facts['os_service_default'],
$user_additional_attribute_mapping = $facts['os_service_default'],
$group_tree_dn = $facts['os_service_default'],
$group_filter = $facts['os_service_default'],
$group_objectclass = $facts['os_service_default'],
$group_id_attribute = $facts['os_service_default'],
$group_name_attribute = $facts['os_service_default'],
$group_member_attribute = $facts['os_service_default'],
$group_members_are_ids = $facts['os_service_default'],
$group_desc_attribute = $facts['os_service_default'],
$group_attribute_ignore = $facts['os_service_default'],
$group_additional_attribute_mapping = $facts['os_service_default'],
$group_ad_nesting = $facts['os_service_default'],
$chase_referrals = $facts['os_service_default'],
$use_tls = $facts['os_service_default'],
$tls_cacertdir = $facts['os_service_default'],
$tls_cacertfile = $facts['os_service_default'],
$tls_req_cert = $facts['os_service_default'],
$identity_driver = 'ldap',
$connection_timeout = $facts['os_service_default'],
$use_pool = $facts['os_service_default'],
$pool_size = $facts['os_service_default'],
$pool_retry_max = $facts['os_service_default'],
$pool_retry_delay = $facts['os_service_default'],
$pool_connection_timeout = $facts['os_service_default'],
$pool_connection_lifetime = $facts['os_service_default'],
$use_auth_pool = $facts['os_service_default'],
$auth_pool_size = $facts['os_service_default'],
$auth_pool_connection_lifetime = $facts['os_service_default'],
$package_ensure = present,
Boolean $manage_packages = true,
Boolean $create_domain_entry = false,
$url = $facts['os_service_default'],
$user = $facts['os_service_default'],
$password = $facts['os_service_default'],
$suffix = $facts['os_service_default'],
$query_scope = $facts['os_service_default'],
$page_size = $facts['os_service_default'],
$user_tree_dn = $facts['os_service_default'],
$user_filter = $facts['os_service_default'],
$user_objectclass = $facts['os_service_default'],
$user_id_attribute = $facts['os_service_default'],
$user_name_attribute = $facts['os_service_default'],
$user_description_attribute = $facts['os_service_default'],
$user_mail_attribute = $facts['os_service_default'],
$user_enabled_attribute = $facts['os_service_default'],
$user_enabled_mask = $facts['os_service_default'],
$user_enabled_default = $facts['os_service_default'],
$user_enabled_invert = $facts['os_service_default'],
$user_attribute_ignore = $facts['os_service_default'],
$user_default_project_id_attribute = $facts['os_service_default'],
$user_pass_attribute = $facts['os_service_default'],
$user_enabled_emulation = $facts['os_service_default'],
$user_enabled_emulation_dn = $facts['os_service_default'],
$user_additional_attribute_mapping = $facts['os_service_default'],
$group_tree_dn = $facts['os_service_default'],
$group_filter = $facts['os_service_default'],
$group_objectclass = $facts['os_service_default'],
$group_id_attribute = $facts['os_service_default'],
$group_name_attribute = $facts['os_service_default'],
$group_member_attribute = $facts['os_service_default'],
$group_members_are_ids = $facts['os_service_default'],
$group_desc_attribute = $facts['os_service_default'],
$group_attribute_ignore = $facts['os_service_default'],
$group_additional_attribute_mapping = $facts['os_service_default'],
$group_ad_nesting = $facts['os_service_default'],
$chase_referrals = $facts['os_service_default'],
$use_tls = $facts['os_service_default'],
$tls_cacertdir = $facts['os_service_default'],
$tls_cacertfile = $facts['os_service_default'],
$tls_req_cert = $facts['os_service_default'],
$identity_driver = 'ldap',
$connection_timeout = $facts['os_service_default'],
$use_pool = $facts['os_service_default'],
$pool_size = $facts['os_service_default'],
$pool_retry_max = $facts['os_service_default'],
$pool_retry_delay = $facts['os_service_default'],
$pool_connection_timeout = $facts['os_service_default'],
$pool_connection_lifetime = $facts['os_service_default'],
$use_auth_pool = $facts['os_service_default'],
$auth_pool_size = $facts['os_service_default'],
$auth_pool_connection_lifetime = $facts['os_service_default'],
Boolean $manage_packages = true,
Stdlib::Ensure::Package $package_ensure = present,
Boolean $create_domain_entry = false,
) {
include keystone::deps
include keystone::params