Merge "Fix optional services-docker environment files"

5 years ago · 925d020d8f
3 changed files with 6 additions and 5 deletions
--- a/environments/services-docker/cinder-backup.yaml
+++ b/environments/services-docker/cinder-backup.yaml
@ -1,4 +1,4 @@
 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
-  # OS::TripleO::Services::CinderBackup: ../docker/services/cinder-backup.yaml
+  # OS::TripleO::Services::CinderBackup: ../../docker/services/cinder-backup.yaml
--- a/environments/services-docker/undercloud-cinder.yaml
+++ b/environments/services-docker/undercloud-cinder.yaml
@ -1,4 +1,4 @@
 resource_registry:
-  OS::TripleO::Services::UndercloudCinderApi: ../docker/services/cinder-api.yaml
-  OS::TripleO::Services::UndercloudCinderScheduler: ../docker/services/cinder-scheduler.yaml
-  OS::TripleO::Services::UndercloudCinderVolume: ../docker/services/cinder-volume.yaml
+  OS::TripleO::Services::UndercloudCinderApi: ../../docker/services/cinder-api.yaml
+  OS::TripleO::Services::UndercloudCinderScheduler: ../../docker/services/cinder-scheduler.yaml
+  OS::TripleO::Services::UndercloudCinderVolume: ../../docker/services/cinder-volume.yaml
--- a/environments/services-docker/undercloud-gnocchi.yaml
+++ b/environments/services-docker/undercloud-gnocchi.yaml
@ -2,3 +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