openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Remove unused variables in tripleo::profile::base::gnocchi"

This commit is contained in:
Zuul 2021-09-02 20:01:55 +00:00 committed by Gerrit Code Review
parent f06f9284db 1ccc83a3f5
commit 2289726e7a
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,11 +42,6 @@
# (Required) Password for the gnocchi redis user for the coordination url
# Defaults to hiera('gnocchi_redis_password')
#
# [*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)
#
# [*redis_vip*]
# (Required) Redis ip address for the coordination url
# Defaults to hiera('redis_vip')
@ -60,7 +55,6 @@ class tripleo::profile::base::gnocchi (
$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_network = hiera('gnocchi_api_network', undef),
$gnocchi_redis_password = hiera('gnocchi_redis_password'),
$redis_vip = hiera('redis_vip'),
$step = Integer(hiera('step')),
@ -73,15 +67,8 @@ class tripleo::profile::base::gnocchi (
}
if $enable_internal_tls {
if !$gnocchi_network {
fail('gnocchi_api_network is not set in the hieradata.')
}
$tls_certfile = $certificates_specs["httpd-${gnocchi_network}"]['service_certificate']
$tls_keyfile = $certificates_specs["httpd-${gnocchi_network}"]['service_key']
$tls_query_param = '?ssl=true'
} else {
$tls_certfile = undef
$tls_keyfile = undef
$tls_query_param = ''
}