From: Emilien Macchi <emilien@redhat.com>
Date: Fri, 30 Sep 2016 13:28:06 +0000 (-0400)
Subject: Telemetry: add redis_password hiera parameter
X-Git-Tag: opnfv-6.0.0~1538^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b97c913f23a0c01a14e74384edc4f2d3a9e0ec1f;p=apex-tripleo-heat-templates.git

Telemetry: add redis_password hiera parameter

Add redis_password parameter in Hiera so we can re-use it from
puppet-tripleo later for Aodh, Ceilometer and Gnocchi.

Change-Id: I038e2bac22e3bfa5047d2e76e23cff664546464d
Partial-Bug: #1629279
---

diff --git a/puppet/services/aodh-base.yaml b/puppet/services/aodh-base.yaml
index 950e9026..821c9571 100644
--- a/puppet/services/aodh-base.yaml
+++ b/puppet/services/aodh-base.yaml
@@ -59,6 +59,7 @@ outputs:
     value:
       service_name: aodh_base
       config_settings:
+        aodh_redis_password: {get_param: RedisPassword}
         aodh::evaluator::coordination_url:
           list_join:
             - ''
diff --git a/puppet/services/ceilometer-agent-central.yaml b/puppet/services/ceilometer-agent-central.yaml
index 2ae46d0e..07f0b49d 100644
--- a/puppet/services/ceilometer-agent-central.yaml
+++ b/puppet/services/ceilometer-agent-central.yaml
@@ -59,5 +59,6 @@ outputs:
                   - '@'
                   - "%{hiera('redis_vip')}"
                   - ':6379/'
+            ceilometer_redis_password: {get_param: RedisPassword}
       step_config: |
         include ::tripleo::profile::base::ceilometer::agent::central
diff --git a/puppet/services/gnocchi-base.yaml b/puppet/services/gnocchi-base.yaml
index 73889363..b5afd006 100644
--- a/puppet/services/gnocchi-base.yaml
+++ b/puppet/services/gnocchi-base.yaml
@@ -56,6 +56,7 @@ outputs:
       service_name: gnocchi_base
       config_settings:
         #Gnocchi engine
+        gnocchi_redis_password: {get_param: RedisPassword}
         gnocchi::debug: {get_param: Debug}
         gnocchi::db::database_connection:
           list_join: