container-images: fix Cinder when running at Edge

When Cinder Volume is running at the Edge, we need to support the
OS::TripleO::Services::CinderVolumeEdge service; as well as the
ContainerCinderConfigImage parameter for the Cinder Volume, since it
only used to be added for Cinder API but Cinder API is disabled at the
Edge.

Closes-Bug: #1920704
Signed-off-by: Emilien Macchi <emilien@redhat.com>
Change-Id: I1e94668978fbf1dc928b6af50a404e6c687707da
(cherry picked from commit 8dc6dfe488)
This commit is contained in:
Emilien Macchi 2021-03-21 22:48:25 -04:00 committed by John Fulton
parent 586b3a4d84
commit 818695e105
1 changed files with 2 additions and 0 deletions

View File

@ -113,6 +113,7 @@ container_images_template:
- OS::TripleO::Services::CinderBackup - OS::TripleO::Services::CinderBackup
- OS::TripleO::Services::CinderScheduler - OS::TripleO::Services::CinderScheduler
- OS::TripleO::Services::CinderVolume - OS::TripleO::Services::CinderVolume
- OS::TripleO::Services::CinderVolumeEdge
- OS::TripleO::Services::UndercloudCinderApi - OS::TripleO::Services::UndercloudCinderApi
- OS::TripleO::Services::UndercloudCinderScheduler - OS::TripleO::Services::UndercloudCinderScheduler
- OS::TripleO::Services::UndercloudCinderVolume - OS::TripleO::Services::UndercloudCinderVolume
@ -139,6 +140,7 @@ container_images_template:
services: services:
- OS::TripleO::Services::BlockStorageCinderVolume - OS::TripleO::Services::BlockStorageCinderVolume
- OS::TripleO::Services::CinderVolume - OS::TripleO::Services::CinderVolume
- OS::TripleO::Services::CinderVolumeEdge
- OS::TripleO::Services::UndercloudCinderVolume - OS::TripleO::Services::UndercloudCinderVolume
- imagename: "{{namespace}}/{{name_prefix}}collectd{{name_suffix}}:{{tag}}" - imagename: "{{namespace}}/{{name_prefix}}collectd{{name_suffix}}:{{tag}}"