openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Telemetry Needs Redis"

Browse Source
This commit is contained in:
Zuul
2018-01-08 18:21:24 +00:00
committed by Gerrit Code Review
parent 7e148af75f b54135fc3a
commit ef6d97c543
4 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
environments/services-docker/undercloud-gnocchi.yaml
View File

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

2
overcloud-resource-registry-puppet.j2.yaml
View File

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

1
roles/Undercloud.yaml
View File

@@ -65,4 +65,5 @@
- OS::TripleO::Services::UndercloudCinderApi
- OS::TripleO::Services::UndercloudCinderScheduler
- OS::TripleO::Services::UndercloudCinderVolume
- OS::TripleO::Services::UndercloudRedis
- OS::TripleO::Services::Zaqar

1
roles_data_undercloud.yaml
View File

@@ -68,5 +68,6 @@
- OS::TripleO::Services::UndercloudCinderApi
- OS::TripleO::Services::UndercloudCinderScheduler
- OS::TripleO::Services::UndercloudCinderVolume
- OS::TripleO::Services::UndercloudRedis
- OS::TripleO::Services::Zaqar