openstack/puppet-tripleo
Code Issues Proposed changes

Merge "Gnocchi: Replace hiera by lookup"

Browse Source
This commit is contained in:
Zuul
2022-07-21 19:11:28 +00:00
committed by Gerrit Code Review
parent f6b7adeec1 c0aaf96791
commit 1d53e71913
5 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
manifests/profile/base/gnocchi.pp
View File

@@ -20,31 +20,31 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('gnocchi_api_short_bootstrap_node_name')
# Defaults to lookup('gnocchi_api_short_bootstrap_node_name', undef, undef, undef)
#
# [*enable_internal_tls*]
# (Optional) Whether TLS in the internal network is enabled or not.
# Defaults to hiera('enable_internal_tls', false)
# Defaults to lookup('enable_internal_tls', undef, undef, false)
#
# [*gnocchi_redis_password*]
# (Required) Password for the gnocchi redis user for the coordination url
# Defaults to hiera('gnocchi_redis_password')
# Defaults to lookup('gnocchi_redis_password')
#
# [*redis_vip*]
# (Required) Redis ip address for the coordination url
# Defaults to hiera('redis_vip')
# Defaults to lookup('redis_vip')
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
class tripleo::profile::base::gnocchi (
$bootstrap_node = hiera('gnocchi_api_short_bootstrap_node_name', undef),
$enable_internal_tls = hiera('enable_internal_tls', false),
$gnocchi_redis_password = hiera('gnocchi_redis_password'),
$redis_vip = hiera('redis_vip'),
$step = Integer(hiera('step')),
$bootstrap_node = lookup('gnocchi_api_short_bootstrap_node_name', undef, undef, undef),
$enable_internal_tls = lookup('enable_internal_tls', undef, undef, false),
$gnocchi_redis_password = lookup('gnocchi_redis_password'),
$redis_vip = lookup('redis_vip'),
$step = Integer(lookup('step')),
) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {

34
manifests/profile/base/gnocchi/api.pp
View File

@@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('gnocchi_api_short_bootstrap_node_name')
# Defaults to lookup('gnocchi_api_short_bootstrap_node_name', undef, undef, undef)
#
# [*certificates_specs*]
# (Optional) The specifications to give to certmonger for the certificate(s)
@@ -32,11 +32,11 @@
# service_certificate: <service certificate path>
# service_key: <service key path>
# principal: "haproxy/<overcloud controller fqdn>"
# Defaults to hiera('apache_certificate_specs', {}).
# Defaults to lookup('apache_certificates_specs', undef, undef, {}).
#
# [*enable_internal_tls*]
# (Optional) Whether TLS in the internal network is enabled or not.
# Defaults to hiera('enable_internal_tls', false)
# Defaults to lookup('enable_internal_tls', undef, undef, false)
#
# [*gnocchi_backend*]
# (Optional) Gnocchi backend string file, swift or rbd
@@ -45,35 +45,35 @@
# [*gnocchi_network*]
# (Optional) The network name where the gnocchi endpoint is listening on.
# This is set by t-h-t.
# Defaults to hiera('gnocchi_api_network', undef)
# Defaults to lookup('gnocchi_api_network', undef, undef, undef)
#
# [*gnocchi_redis_password*]
# (Required) Password for the gnocchi redis user for the coordination url
# Defaults to hiera('gnocchi_redis_password')
# Defaults to lookup('gnocchi_redis_password')
#
# [*redis_vip*]
# (Required) Redis ip address for the coordination url
# Defaults to hiera('redis_vip')
# Defaults to lookup('redis_vip')
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
# [*incoming_storage_driver*]
# (Optional) Storage driver to use for incoming metric data
# Defaults to hiera('incoming_storage_driver', undef)
# Defaults to lookup('incoming_storage_driver', undef, undef, undef)
#
class tripleo::profile::base::gnocchi::api (
$bootstrap_node = hiera('gnocchi_api_short_bootstrap_node_name', undef),
$certificates_specs = hiera('apache_certificates_specs', {}),
$enable_internal_tls = hiera('enable_internal_tls', false),
$gnocchi_backend = downcase(hiera('gnocchi_backend', 'swift')),
$gnocchi_network = hiera('gnocchi_api_network', undef),
$gnocchi_redis_password = hiera('gnocchi_redis_password'),
$redis_vip = hiera('redis_vip'),
$step = Integer(hiera('step')),
$incoming_storage_driver = hiera('incoming_storage_driver', undef),
$bootstrap_node = lookup('gnocchi_api_short_bootstrap_node_name', undef, undef, undef),
$certificates_specs = lookup('apache_certificates_specs', undef, undef, {}),
$enable_internal_tls = lookup('enable_internal_tls', undef, undef, false),
$gnocchi_backend = downcase(lookup('gnocchi_backend', undef, undef, 'swift')),
$gnocchi_network = lookup('gnocchi_api_network', undef, undef, undef),
$gnocchi_redis_password = lookup('gnocchi_redis_password'),
$redis_vip = lookup('redis_vip'),
$step = Integer(lookup('step')),
$incoming_storage_driver = lookup('incoming_storage_driver', undef, undef, undef),
) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true

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

@@ -21,28 +21,28 @@
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
# [*memcached_hosts*]
# (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*]
# (Optional) Memcached port to use.
# Defaults to hiera('memcached_authtoken_port', 11211)
# Defaults to lookup('memcached_authtoken_port', undef, undef, 11211)
#
# [*memcached_ipv6*]
# (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*]
# (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*]
# (Optional) Memcached (authtoken) secret key, used with security_strategy.
# 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
#
@@ -51,12 +51,12 @@
# Defaults to undef
#
class tripleo::profile::base::gnocchi::authtoken (
$step = Integer(hiera('step')),
$memcached_hosts = hiera('memcached_node_names', []),
$memcached_port = hiera('memcached_authtoken_port', 11211),
$memcached_ipv6 = hiera('memcached_ipv6', false),
$security_strategy = hiera('memcached_authtoken_security_strategy', undef),
$secret_key = hiera('memcached_authtoken_secret_key', undef),
$step = Integer(lookup('step')),
$memcached_hosts = lookup('memcached_node_names', undef, undef, []),
$memcached_port = lookup('memcached_authtoken_port', undef, undef, 11211),
$memcached_ipv6 = lookup('memcached_ipv6', undef, undef, false),
$security_strategy = lookup('memcached_authtoken_security_strategy', undef, undef, undef),
$secret_key = lookup('memcached_authtoken_secret_key', undef, undef, undef),
# DEPRECATED PARAMETERS
$memcached_ips = undef
) {

4
manifests/profile/base/gnocchi/metricd.pp
View File

@@ -21,10 +21,10 @@
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
class tripleo::profile::base::gnocchi::metricd (
$step = Integer(hiera('step')),
$step = Integer(lookup('step')),
) {
include tripleo::profile::base::gnocchi

4
manifests/profile/base/gnocchi/statsd.pp
View File

@@ -21,10 +21,10 @@
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
class tripleo::profile::base::gnocchi::statsd (
$step = Integer(hiera('step')),
$step = Integer(lookup('step')),
) {
include tripleo::profile::base::gnocchi