aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-17 01:00:58 +0000
committerGerrit Code Review <review@openstack.org>2016-08-17 01:00:58 +0000
commit85938c987c829731167659871c84b87242c4ea42 (patch)
tree0d50f9a16d0de853f633e4802ef68caaaa59313f
parentcd5710b0faf2525896c9f81ed408b7be9900d1f3 (diff)
parentc93fb4f4d6a82cd2aa737a2d4a1ee630b918a89d (diff)
Merge "Set coordination url for gnocchi storage"
-rw-r--r--puppet/services/gnocchi-base.yaml12
1 files changed, 12 insertions, 0 deletions
diff --git a/puppet/services/gnocchi-base.yaml b/puppet/services/gnocchi-base.yaml
index 3631508e..a072e8ef 100644
--- a/puppet/services/gnocchi-base.yaml
+++ b/puppet/services/gnocchi-base.yaml
@@ -34,6 +34,10 @@ parameters:
type: string
default: 'regionOne'
description: Keystone region for endpoint
+ RedisPassword:
+ description: The password for the redis service account.
+ type: string
+ hidden: true
outputs:
aux_parameters:
@@ -65,6 +69,14 @@ outputs:
gnocchi::api::service_name: 'httpd'
gnocchi::api::keystone_password: {get_param: GnocchiPassword}
gnocchi::wsgi::apache::ssl: false
+ gnocchi::storage::coordination_url:
+ list_join:
+ - ''
+ - - 'redis://:'
+ - {get_param: RedisPassword}
+ - '@'
+ - "%{hiera('redis_vip')}"
+ - ':6379/'
gnocchi::storage::swift::swift_user: 'service:gnocchi'
gnocchi::storage::swift::swift_auth_version: 2
gnocchi::storage::swift::swift_key: {get_param: GnocchiPassword}