summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-30 18:52:04 +0000
committerGerrit Code Review <review@openstack.org>2016-09-30 18:52:04 +0000
commitfa69c44b28d7dc145c5601b567a318efc2c0f10e (patch)
tree15cd2c1a421584a14d2c60f4b685d46f13907664 /puppet
parent07819ffc0608faf4d56f8c100d47ebdcb059331f (diff)
parentb97c913f23a0c01a14e74384edc4f2d3a9e0ec1f (diff)
Merge "Telemetry: add redis_password hiera parameter"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/aodh-base.yaml1
-rw-r--r--puppet/services/ceilometer-agent-central.yaml1
-rw-r--r--puppet/services/gnocchi-base.yaml1
3 files changed, 3 insertions, 0 deletions
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: