From b54135fc3a6c7a58d0523880d619b9df49736ebc Mon Sep 17 00:00:00 2001 From: Ian Main Date: Fri, 15 Dec 2017 21:12:08 +0000 Subject: [PATCH] Telemetry Needs Redis Add redis to the undercloud when telemetry is added. Change-Id: I5fc235e6f77efba73ab1858e959357a954c7b7a3 --- environments/services-docker/undercloud-gnocchi.yaml | 2 +- overcloud-resource-registry-puppet.j2.yaml | 2 ++ roles/Undercloud.yaml | 1 + roles_data_undercloud.yaml | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/environments/services-docker/undercloud-gnocchi.yaml b/environments/services-docker/undercloud-gnocchi.yaml index 6d5f86cec4..bf7f2a9dc9 100644 --- a/environments/services-docker/undercloud-gnocchi.yaml +++ b/environments/services-docker/undercloud-gnocchi.yaml @@ -2,4 +2,4 @@ resource_registry: OS::TripleO::Services::UndercloudGnocchiApi: ../../docker/services/gnocchi-api.yaml OS::TripleO::Services::UndercloudGnocchiMetricd: ../../docker/services/gnocchi-metricd.yaml OS::TripleO::Services::UndercloudGnocchiStatsd: ../../docker/services/gnocchi-statsd.yaml - OS::TripleO::Services::Redis: ../../docker/services/database/redis.yaml + OS::TripleO::Services::UndercloudRedis: ../../docker/services/database/redis.yaml diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index a8a8be6a9d..1619599f64 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -235,6 +235,8 @@ resource_registry: OS::TripleO::Services::UndercloudGnocchiApi: OS::Heat::None OS::TripleO::Services::UndercloudGnocchiMetricd: OS::Heat::None OS::TripleO::Services::UndercloudGnocchiStatsd: OS::Heat::None + # Redis + OS::TripleO::Services::UndercloudRedis: OS::Heat::None # Services that are disabled by default (use relevant environment files): OS::TripleO::Services::Fluentd: OS::Heat::None OS::TripleO::Services::Ipsec: OS::Heat::None diff --git a/roles/Undercloud.yaml b/roles/Undercloud.yaml index 19b8a9bc9b..d4011ef9fa 100644 --- a/roles/Undercloud.yaml +++ b/roles/Undercloud.yaml @@ -64,4 +64,5 @@ - OS::TripleO::Services::UndercloudCinderApi - OS::TripleO::Services::UndercloudCinderScheduler - OS::TripleO::Services::UndercloudCinderVolume + - OS::TripleO::Services::UndercloudRedis - OS::TripleO::Services::Zaqar diff --git a/roles_data_undercloud.yaml b/roles_data_undercloud.yaml index f068d9ab9c..6ed9832c8a 100644 --- a/roles_data_undercloud.yaml +++ b/roles_data_undercloud.yaml @@ -67,5 +67,6 @@ - OS::TripleO::Services::UndercloudCinderApi - OS::TripleO::Services::UndercloudCinderScheduler - OS::TripleO::Services::UndercloudCinderVolume + - OS::TripleO::Services::UndercloudRedis - OS::TripleO::Services::Zaqar