aboutsummaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2016-09-30 09:41:11 -0400
committerEmilien Macchi <emilien@redhat.com>2016-09-30 09:47:30 -0400
commit1e26963bef085c7ec16b342594da6286235fe7da (patch)
tree4ac67ff8e681f5adaa5d5c4f25771bf7d76c354a /manifests
parentb8f8d0fbd65104a4b79ab98f26a7d8a9815dbdeb (diff)
telemetry: normalize coordination_url
Normalize coordination_url for Telemetry services, so we can deploy them with IPv6. Change-Id: Ic6de09acf0d36ca90cc2041c0add1bc2b4a369a5 Partial-Bug: #1629279 Depends-On: I038e2bac22e3bfa5047d2e76e23cff664546464d
Diffstat (limited to 'manifests')
-rw-r--r--manifests/profile/base/aodh/evaluator.pp4
-rw-r--r--manifests/profile/base/ceilometer/agent/central.pp4
-rw-r--r--manifests/profile/base/gnocchi/api.pp5
3 files changed, 10 insertions, 3 deletions
diff --git a/manifests/profile/base/aodh/evaluator.pp b/manifests/profile/base/aodh/evaluator.pp
index 610d5a8..d9b48b3 100644
--- a/manifests/profile/base/aodh/evaluator.pp
+++ b/manifests/profile/base/aodh/evaluator.pp
@@ -30,7 +30,9 @@ class tripleo::profile::base::aodh::evaluator (
include ::tripleo::profile::base::aodh
if $step >= 4 {
- include ::aodh::evaluator
+ class { '::aodh::evaluator':
+ coordination_url => join(['redis://:', hiera('aodh_redis_password'), '@', normalize_ip_for_uri(hiera('redis_vip')), ':6379/']),
+ }
}
}
diff --git a/manifests/profile/base/ceilometer/agent/central.pp b/manifests/profile/base/ceilometer/agent/central.pp
index c91e610..033d34c 100644
--- a/manifests/profile/base/ceilometer/agent/central.pp
+++ b/manifests/profile/base/ceilometer/agent/central.pp
@@ -30,7 +30,9 @@ class tripleo::profile::base::ceilometer::agent::central (
if $step >= 4 {
include ::ceilometer::agent::auth
- include ::ceilometer::agent::central
+ class { '::ceilometer::agent::central':
+ coordination_url => join(['redis://:', hiera('ceilometer_redis_password'), '@', normalize_ip_for_uri(hiera('redis_vip')), ':6379/']),
+ }
}
}
diff --git a/manifests/profile/base/gnocchi/api.pp b/manifests/profile/base/gnocchi/api.pp
index 732ea26..9a08551 100644
--- a/manifests/profile/base/gnocchi/api.pp
+++ b/manifests/profile/base/gnocchi/api.pp
@@ -51,7 +51,10 @@ class tripleo::profile::base::gnocchi::api (
if $step >= 4 {
include ::gnocchi::api
include ::gnocchi::wsgi::apache
- include ::gnocchi::storage
+
+ class { '::gnocchi::storage':
+ coordination_url => join(['redis://:', hiera('gnocchi_redis_password'), '@', normalize_ip_for_uri(hiera('redis_vip')), ':6379/']),
+ }
case $gnocchi_backend {
'swift': { include ::gnocchi::storage::swift }
'file': { include ::gnocchi::storage::file }