openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix optional services-docker environment files"

This commit is contained in:
Zuul 2017-12-01 12:30:43 +00:00 committed by Gerrit Code Review
parent 1f457f2ab8 0f310f2f0c
commit 925d020d8f
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
environments/services-docker/cinder-backup.yaml
View File

@ -1,4 +1,4 @@
resource_registry: resource_registry:
OS::TripleO::Services::CinderBackup: ../docker/services/pacemaker/cinder-backup.yaml OS::TripleO::Services::CinderBackup: ../../docker/services/pacemaker/cinder-backup.yaml
# For non-pcmk managed implementation # For non-pcmk managed implementation
# OS::TripleO::Services::CinderBackup: ../docker/services/cinder-backup.yaml # OS::TripleO::Services::CinderBackup: ../../docker/services/cinder-backup.yaml

6
environments/services-docker/undercloud-cinder.yaml
View File

@ -1,4 +1,4 @@
resource_registry: resource_registry:
OS::TripleO::Services::UndercloudCinderApi: ../docker/services/cinder-api.yaml OS::TripleO::Services::UndercloudCinderApi: ../../docker/services/cinder-api.yaml
OS::TripleO::Services::UndercloudCinderScheduler: ../docker/services/cinder-scheduler.yaml OS::TripleO::Services::UndercloudCinderScheduler: ../../docker/services/cinder-scheduler.yaml
OS::TripleO::Services::UndercloudCinderVolume: ../docker/services/cinder-volume.yaml OS::TripleO::Services::UndercloudCinderVolume: ../../docker/services/cinder-volume.yaml

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

@ -2,3 +2,4 @@ resource_registry:
OS::TripleO::Services::UndercloudGnocchiApi: ../../docker/services/gnocchi-api.yaml OS::TripleO::Services::UndercloudGnocchiApi: ../../docker/services/gnocchi-api.yaml
OS::TripleO::Services::UndercloudGnocchiMetricd: ../../docker/services/gnocchi-metricd.yaml OS::TripleO::Services::UndercloudGnocchiMetricd: ../../docker/services/gnocchi-metricd.yaml
OS::TripleO::Services::UndercloudGnocchiStatsd: ../../docker/services/gnocchi-statsd.yaml OS::TripleO::Services::UndercloudGnocchiStatsd: ../../docker/services/gnocchi-statsd.yaml
OS::TripleO::Services::Redis: ../../docker/services/database/redis.yaml