openstack/puppet-tripleo
Code Issues Proposed changes

telemetry: normalize coordination_url

Browse Source 
Normalize coordination_url for Telemetry services, so we can deploy them
with IPv6.

Change-Id: Ic6de09acf0d36ca90cc2041c0add1bc2b4a369a5
Partial-Bug: #1629279
Depends-On: I038e2bac22e3bfa5047d2e76e23cff664546464d
This commit is contained in:
Emilien Macchi 2016-09-30 09:41:11 -04:00
parent b8f8d0fbd6
commit 1e26963bef
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/profile/base/aodh/evaluator.pp
View File

@ -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/']),
}
}
}

4
manifests/profile/base/ceilometer/agent/central.pp
View File

@ -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/']),
}
}
}

5
manifests/profile/base/gnocchi/api.pp
View File

@ -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 }