From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 17 Aug 2016 01:00:58 +0000 (+0000)
Subject: Merge "Set coordination url for gnocchi storage"
X-Git-Tag: opnfv-6.0.0~1758
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=85938c987c829731167659871c84b87242c4ea42;p=apex-tripleo-heat-templates.git

Merge "Set coordination url for gnocchi storage"
---

85938c987c829731167659871c84b87242c4ea42
diff --cc puppet/services/gnocchi-base.yaml
index 3631508e,fcd81b26..a072e8ef
--- a/puppet/services/gnocchi-base.yaml
+++ b/puppet/services/gnocchi-base.yaml
@@@ -63,8 -70,17 +67,16 @@@ outputs
          gnocchi::api::manage_service: false
          gnocchi::api::enabled: true
          gnocchi::api::service_name: 'httpd'
 -        gnocchi::api::keystone_tenant: 'service'
          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}