openstack
/
tripleo-common
Code Issues Proposed changes

Replace zaqar image with zaqar-wsgi image 

Since kolla change Ic356fb81c19ebbc78aa3c7e871c4946d1f712a45 there are
now 2 zaqar images, and we only need the WSGI one.

Change-Id: I26e3aca0641d093857da5da5e88da004ff4e1576
Co-Authored-By: Emilien Macchi <emilien@redhat.com>
Closes-Bug: #1808349
This commit is contained in:
Marios Andreou 2018-12-14 15:37:57 +02:00 committed by wes hayutin
parent 4b7f886e7f
commit 3a44e5bed2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
container-images/overcloud_containers.yaml
View File

@ -209,7 +209,7 @@ container_images:
image_source: kolla
- imagename: docker.io/tripleomaster/centos-binary-tripleo-ui:current-tripleo
image_source: kolla
- imagename: docker.io/tripleomaster/centos-binary-zaqar:current-tripleo
- imagename: docker.io/tripleomaster/centos-binary-zaqar-wsgi:current-tripleo
image_source: kolla
- imagename: docker.io/ceph/daemon:v3.2.0-stable-3.2-luminous-centos-7-x86_64
image_source: ceph

2
container-images/overcloud_containers.yaml.j2
View File

@ -883,7 +883,7 @@ container_images_template:
services:
- OS::TripleO::Services::TripleoUI
- imagename: "{{namespace}}/{{name_prefix}}zaqar{{name_suffix}}:{{tag}}"
- imagename: "{{namespace}}/{{name_prefix}}zaqar-wsgi{{name_suffix}}:{{tag}}"
image_source: kolla
params:
- DockerZaqarConfigImage