aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/base/aodh
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-09-06 09:37:27 +0000
committerGerrit Code Review <review@openstack.org>2017-09-06 09:37:27 +0000
commit08677754f9622bc9264fda00251cf6bb3f00cc24 (patch)
tree04c2da4da7cd45dc0ec30c715bec60a6961e8413 /manifests/profile/base/aodh
parent46a34f0a6fbf73b555d70ecd828222a325763a01 (diff)
parentd905ed08052ca5dc78b5f7f56f731394f19958ed (diff)
Merge "Use TLS proxy for Redis' internal TLS" into stable/pike
Diffstat (limited to 'manifests/profile/base/aodh')
-rw-r--r--manifests/profile/base/aodh/evaluator.pp14
1 files changed, 12 insertions, 2 deletions
diff --git a/manifests/profile/base/aodh/evaluator.pp b/manifests/profile/base/aodh/evaluator.pp
index 1b25b37..9b3462f 100644
--- a/manifests/profile/base/aodh/evaluator.pp
+++ b/manifests/profile/base/aodh/evaluator.pp
@@ -18,20 +18,30 @@
#
# === Parameters
#
+# [*enable_internal_tls*]
+# (Optional) Whether TLS in the internal network is enabled or not.
+# Defaults to hiera('enable_internal_tls', false)
+#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::aodh::evaluator (
- $step = Integer(hiera('step')),
+ $enable_internal_tls = hiera('enable_internal_tls', false),
+ $step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::aodh
+ if $enable_internal_tls {
+ $tls_query_param = '?ssl=true'
+ } else {
+ $tls_query_param = ''
+ }
if $step >= 4 {
class { '::aodh::evaluator':
- coordination_url => join(['redis://:', hiera('aodh_redis_password'), '@', normalize_ip_for_uri(hiera('redis_vip')), ':6379/']),
+ coordination_url => join(['redis://:', hiera('aodh_redis_password'), '@', normalize_ip_for_uri(hiera('redis_vip')), ':6379/', $tls_query_param]),
}
}