diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-09-06 09:37:27 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-09-06 09:37:27 +0000 |
commit | 08677754f9622bc9264fda00251cf6bb3f00cc24 (patch) | |
tree | 04c2da4da7cd45dc0ec30c715bec60a6961e8413 /manifests/profile/base/gnocchi | |
parent | 46a34f0a6fbf73b555d70ecd828222a325763a01 (diff) | |
parent | d905ed08052ca5dc78b5f7f56f731394f19958ed (diff) |
Merge "Use TLS proxy for Redis' internal TLS" into stable/pike
Diffstat (limited to 'manifests/profile/base/gnocchi')
-rw-r--r-- | manifests/profile/base/gnocchi/api.pp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/manifests/profile/base/gnocchi/api.pp b/manifests/profile/base/gnocchi/api.pp index 88177fd..c958359 100644 --- a/manifests/profile/base/gnocchi/api.pp +++ b/manifests/profile/base/gnocchi/api.pp @@ -84,9 +84,11 @@ class tripleo::profile::base::gnocchi::api ( } $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 = '' } if $step >= 4 and $sync_db { @@ -104,11 +106,11 @@ class tripleo::profile::base::gnocchi::api ( if $step >= 4 { class { '::gnocchi::storage': - coordination_url => join(['redis://:', $gnocchi_redis_password, '@', normalize_ip_for_uri($redis_vip), ':6379/']), + coordination_url => join(['redis://:', $gnocchi_redis_password, '@', normalize_ip_for_uri($redis_vip), ':6379/', $tls_query_param]), } class { '::gnocchi::storage::incoming::redis': - redis_url => join(['redis://:', $gnocchi_redis_password, '@', normalize_ip_for_uri($redis_vip), ':6379/']), + redis_url => join(['redis://:', $gnocchi_redis_password, '@', normalize_ip_for_uri($redis_vip), ':6379/', $tls_query_param]), } case $gnocchi_backend { |