openstack
/
puppet-tripleo
Code Issues Proposed changes

Heat: Sync default value in parameter description 

This fixes default values in parameter description which do not match
the actual values or are missing.

Also, the base heat manifest uses downcase() when defining default for
bootstrap node name but this is not used in the other manifests. So
it is also removed by this change.

Change-Id: I757956303f65f9753d2e5220bbcefce5e2f3c07f
This commit is contained in:
Takashi Kajinami 2022-04-22 08:51:23 +09:00
parent a06b94c4a3
commit 798ea9afab
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
manifests/profile/base/heat.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to downcase(lookup('heat_engine_short_bootstrap_node_name'))
# Defaults to lookup('heat_engine_short_bootstrap_node_name')
#
# [*manage_db_purge*]
# (Optional) Whether to enable db purging
@ -29,19 +29,19 @@
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to lookup('step')
# Defaults to Integer(lookup('step'))
#
# [*oslomsg_rpc_proto*]
# Protocol driver for the oslo messaging rpc service
# Defaults to lookup('oslo_messaging_rpc_scheme', undef, undef, rabbit)
# Defaults to lookup('oslo_messaging_rpc_scheme', undef, undef, 'rabbit')
#
# [*oslomsg_rpc_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to lookup('oslo_messaging_rpc_node_names')
# Defaults to any2array(lookup('oslo_messaging_rpc_node_names', undef, undef, undef))
#
# [*oslomsg_rpc_port*]
# IP port for oslo messaging rpc service
# Defaults to lookup('oslo_messaging_rpc_port', undef, undef, 5672)
# Defaults to lookup('oslo_messaging_rpc_port', undef, undef, '5672')
#
# [*oslomsg_rpc_username*]
# Username for oslo messaging rpc service
@ -57,15 +57,15 @@
#
# [*oslomsg_notify_proto*]
# Protocol driver for the oslo messaging notify service
# Defaults to lookup('oslo_messaging_notify_scheme', undef, undef, rabbit)
# Defaults to lookup('oslo_messaging_notify_scheme', undef, undef, 'rabbit')
#
# [*oslomsg_notify_hosts*]
# list of the oslo messaging notify host fqdns
# Defaults to lookup('oslo_messaging_notify_node_names')
# Defaults to any2array(lookup('oslo_messaging_notify_node_names', undef, undef, undef))
#
# [*oslomsg_notify_port*]
# IP port for oslo messaging notify service
# Defaults to lookup('oslo_messaging_notify_port', undef, undef, 5672)
# Defaults to lookup('oslo_messaging_notify_port', undef, undef, '5672')
#
# [*oslomsg_notify_username*]
# Username for oslo messaging notify service
@ -102,7 +102,7 @@
# Defaults to undef
#
class tripleo::profile::base::heat (
$bootstrap_node = downcase(lookup('heat_engine_short_bootstrap_node_name')),
$bootstrap_node = lookup('heat_engine_short_bootstrap_node_name'),
$manage_db_purge = lookup('heat_enable_db_purge', undef, undef, true),
$step = Integer(lookup('step')),
$oslomsg_rpc_proto = lookup('oslo_messaging_rpc_scheme', undef, undef, 'rabbit'),

6
manifests/profile/base/heat/api.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to lookup('heat_api_short_bootstrap_node_name')
# Defaults to lookup('heat_api_short_bootstrap_node_name', undef, undef, undef)
#
# [*certificates_specs*]
# (Optional) The specifications to give to certmonger for the certificate(s)
@ -32,7 +32,7 @@
# service_certificate: <service certificate path>
# service_key: <service key path>
# principal: "haproxy/<overcloud controller fqdn>"
# Defaults to lookup('apache_certificate_specs', undef, undef, {}).
# Defaults to lookup('apache_certificates_specs', undef, undef, {}).
#
# [*enable_internal_tls*]
# (Optional) Whether TLS in the internal network is enabled or not.
@ -46,7 +46,7 @@
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to lookup('step')
# Defaults to Integer(lookup('step'))
#
class tripleo::profile::base::heat::api (
$bootstrap_node = lookup('heat_api_short_bootstrap_node_name', undef, undef, undef),

6
manifests/profile/base/heat/api_cfn.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to lookup('heat_api_cfn_short_bootstrap_node_name')
# Defaults to lookup('heat_api_cfn_short_bootstrap_node_name', undef, undef, undef)
#
# [*certificates_specs*]
# (Optional) The specifications to give to certmonger for the certificate(s)
@ -32,7 +32,7 @@
# service_certificate: <service certificate path>
# service_key: <service key path>
# principal: "haproxy/<overcloud controller fqdn>"
# Defaults to lookup('apache_certificate_specs', undef, undef, {}).
# Defaults to lookup('apache_certificates_specs', undef, undef, {}).
#
# [*enable_internal_tls*]
# (Optional) Whether TLS in the internal network is enabled or not.
@ -46,7 +46,7 @@
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to lookup('step')
# Defaults to Integer(lookup('step'))
#
class tripleo::profile::base::heat::api_cfn (
$bootstrap_node = lookup('heat_api_cfn_short_bootstrap_node_name', undef, undef, undef),

2
manifests/profile/base/heat/authtoken.pp
View File

@ -21,7 +21,7 @@
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to lookup('step')
# Defaults to Integer(lookup('step'))
#
# [*memcached_hosts*]
# (Optional) Array of hostnames, ipv4 or ipv6 addresses for memcache.

4
manifests/profile/base/heat/engine.pp
View File

@ -20,12 +20,12 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to lookup('heat_engine_short_bootstrap_node_name')
# Defaults to lookup('heat_engine_short_bootstrap_node_name', undef, undef, undef)
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to lookup('step')
# Defaults to Integer(lookup('step'))
#
class tripleo::profile::base::heat::engine (
$bootstrap_node = lookup('heat_engine_short_bootstrap_node_name', undef, undef, undef),