openstack
/
tripleo-common
Code Issues Proposed changes

Remove sahara-* from list in tripleo_containers.yaml 

74799d9beb
added sahara-* containers back to
container-images/tripleo_containers.yaml.

sahara containers are no longer built for
releases after train.

Change-Id: Ie42a8d0a079eca561ce962f994e31e39bfb7f636
(cherry picked from commit Icd00ea16c1ee30837a10703d374f3d5fbe4e42a2)
This commit is contained in:
Wes Hayutin 2020-08-31 20:02:07 -06:00
parent 50d235ba5f
commit 427e600bd8
2 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
container-images/tripleo_containers.yaml
View File

@ -199,10 +199,6 @@ container_images:
image_source: tripleo
- imagename: docker.io/tripleou/centos-binary-redis:current-tripleo
image_source: tripleo
- imagename: docker.io/tripleou/centos-binary-sahara-api:current-tripleo
image_source: tripleo
- imagename: docker.io/tripleou/centos-binary-sahara-engine:current-tripleo
image_source: tripleo
- imagename: docker.io/tripleou/centos-binary-swift-base:current-tripleo
image_source: tripleo
- imagename: docker.io/tripleou/centos-binary-swift-account:current-tripleo

16
container-images/tripleo_containers.yaml.j2
View File

@ -756,22 +756,6 @@ container_images_template:
- OS::TripleO::Services::Redis
- OS::TripleO::Services::UndercloudRedis
- imagename: "{{namespace}}/{{name_prefix}}sahara-api{{name_suffix}}:{{tag}}"
image_source: tripleo
params:
- ContainerSaharaApiImage
- ContainerSaharaConfigImage
services:
- OS::TripleO::Services::SaharaApi
- OS::TripleO::Services::SaharaEngine
- imagename: "{{namespace}}/{{name_prefix}}sahara-engine{{name_suffix}}:{{tag}}"
image_source: tripleo
params:
- ContainerSaharaEngineImage
services:
- OS::TripleO::Services::SaharaEngine
- imagename: "{{namespace}}/{{name_prefix}}swift-base{{name_suffix}}:{{tag}}"
image_source: tripleo