openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Ironic-inspector: Replace hiera by lookup"

This commit is contained in:
Zuul 2022-05-25 17:45:57 +00:00 committed by Gerrit Code Review
parent 2415c5741d 445ddfd144
commit 9484293fe2
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/profile/base/ironic_inspector.pp
View File

@ -47,16 +47,16 @@
# #
# [*bootstrap_node*] # [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks # (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('ironic_inspector_short_bootstrap_node_name') # Defaults to lookup('ironic_inspector_short_bootstrap_node_name', undef, undef, undef)
# #
# [*step*] # [*step*]
# (Optional) The current step of the deployment # (Optional) The current step of the deployment
# Defaults to hiera('step') # Defaults to Integer(lookup('step'))
class tripleo::profile::base::ironic_inspector ( class tripleo::profile::base::ironic_inspector (
$inspection_subnets = [], $inspection_subnets = [],
$bootstrap_node = hiera('ironic_inspector_short_bootstrap_node_name', undef), $bootstrap_node = lookup('ironic_inspector_short_bootstrap_node_name', undef, undef, undef),
$step = Integer(hiera('step')), $step = Integer(lookup('step')),
) { ) {
include tripleo::profile::base::ironic_inspector::authtoken include tripleo::profile::base::ironic_inspector::authtoken

24
manifests/profile/base/ironic_inspector/authtoken.pp
View File

@ -21,28 +21,28 @@
# [*step*] # [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates # (Optional) The current step in deployment. See tripleo-heat-templates
# for more details. # for more details.
# Defaults to hiera('step') # Defaults to Integer(lookup('step'))
# #
# [*memcached_hosts*] # [*memcached_hosts*]
# (Optional) Array of hostnames, ipv4 or ipv6 addresses for memcache. # (Optional) Array of hostnames, ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_names', []) # Defaults to lookup('memcached_node_names', undef, undef, [])
# #
# [*memcached_port*] # [*memcached_port*]
# (Optional) Memcached port to use. # (Optional) Memcached port to use.
# Defaults to hiera('memcached_authtoken_port', 11211) # Defaults to lookup('memcached_authtoken_port', undef, undef, 11211)
# #
# [*memcached_ipv6*] # [*memcached_ipv6*]
# (Optional) Whether Memcached uses IPv6 network instead of IPv4 network. # (Optional) Whether Memcached uses IPv6 network instead of IPv4 network.
# Defauls to hiera('memcached_ipv6', false) # Defauls to lookup('memcached_ipv6', undef, undef, false)
# #
# [*security_strategy*] # [*security_strategy*]
# (Optional) Memcached (authtoken) security strategy. # (Optional) Memcached (authtoken) security strategy.
# Defaults to hiera('memcached_authtoken_security_strategy', undef) # Defaults to lookup('memcached_authtoken_security_strategy', undef, undef, undef)
# #
# [*secret_key*] # [*secret_key*]
# (Optional) Memcached (authtoken) secret key, used with security_strategy. # (Optional) Memcached (authtoken) secret key, used with security_strategy.
# The key is hashed with a salt, to isolate services. # The key is hashed with a salt, to isolate services.
# Defaults to hiera('memcached_authtoken_secret_key', undef) # Defaults to lookup('memcached_authtoken_secret_key', undef, undef, undef)
# #
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
# #
@ -51,12 +51,12 @@
# Defaults to undef # Defaults to undef
# #
class tripleo::profile::base::ironic_inspector::authtoken ( class tripleo::profile::base::ironic_inspector::authtoken (
$step = Integer(hiera('step')), $step = Integer(lookup('step')),
$memcached_hosts = hiera('memcached_node_names', []), $memcached_hosts = lookup('memcached_node_names', undef, undef, []),
$memcached_port = hiera('memcached_authtoken_port', 11211), $memcached_port = lookup('memcached_authtoken_port', undef, undef, 11211),
$memcached_ipv6 = hiera('memcached_ipv6', false), $memcached_ipv6 = lookup('memcached_ipv6', undef, undef, false),
$security_strategy = hiera('memcached_authtoken_security_strategy', undef), $security_strategy = lookup('memcached_authtoken_security_strategy', undef, undef, undef),
$secret_key = hiera('memcached_authtoken_secret_key', undef), $secret_key = lookup('memcached_authtoken_secret_key', undef, undef, undef),
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$memcached_ips = undef $memcached_ips = undef
) { ) {