diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-06-21 00:11:38 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-06-21 00:11:38 +0000 |
commit | 3a1074fb980987faafb45dd24f09237990f1e575 (patch) | |
tree | 6ca11df9cea2d3a3927a698b97d0ed347d1322cc /manifests/profile/base/gnocchi/api.pp | |
parent | ca05d7101a739cff0eba7588bcbc869d5ff302d3 (diff) | |
parent | 8779d1a5262c683d1b225b92408b6c633d28eed9 (diff) |
Merge "Cover gnocchi api step 4 and 5" into stable/ocata
Diffstat (limited to 'manifests/profile/base/gnocchi/api.pp')
-rw-r--r-- | manifests/profile/base/gnocchi/api.pp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/manifests/profile/base/gnocchi/api.pp b/manifests/profile/base/gnocchi/api.pp index 029eb99..21b8325 100644 --- a/manifests/profile/base/gnocchi/api.pp +++ b/manifests/profile/base/gnocchi/api.pp @@ -55,6 +55,14 @@ # This is set by t-h-t. # Defaults to hiera('gnocchi_api_network', undef) # +# [*gnocchi_redis_password*] +# (Required) Password for the gnocchi redis user for the coordination url +# Defaults to hiera('gnocchi_redis_password') +# +# [*redis_vip*] +# (Required) Redis ip address for the coordination url +# Defaults to hiera('redis_vip') +# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. @@ -67,6 +75,8 @@ class tripleo::profile::base::gnocchi::api ( $generate_service_certificates = hiera('generate_service_certificates', 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 = hiera('step'), ) { if $::hostname == downcase($bootstrap_node) { @@ -107,7 +117,7 @@ class tripleo::profile::base::gnocchi::api ( if $step >= 4 { class { '::gnocchi::storage': - coordination_url => join(['redis://:', hiera('gnocchi_redis_password'), '@', normalize_ip_for_uri(hiera('redis_vip')), ':6379/']), + coordination_url => join(['redis://:', $gnocchi_redis_password, '@', normalize_ip_for_uri($redis_vip), ':6379/']), } case $gnocchi_backend { 'swift': { include ::gnocchi::storage::swift } |