openstack/tripleo-common
Code Issues Proposed changes

Merge "Add openshift sti-builder image"

Browse Source
This commit is contained in:
Zuul 2018-07-14 21:52:13 +00:00 committed by Gerrit Code Review
commit 2280132d2d
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
container-images/overcloud_containers.yaml
View File

@ -112,6 +112,7 @@ container_images:
- imagename: docker.io/openshift/origin-docker-registry:v3.9.0
- imagename: docker.io/openshift/origin-haproxy-router:v3.9.0
- imagename: docker.io/openshift/origin-pod:v3.9.0
- imagename: docker.io/openshift/origin-sti-builder:v3.9.0
- imagename: docker.io/openshift/origin-web-console:v3.9.0
- imagename: docker.io/cockpit/kubernetes:latest
- imagename: registry.fedoraproject.org/latest/etcd:latest

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

@ -831,6 +831,12 @@ container_images_template:
- OS::TripleO::Services::OpenShift::Master
- OS::TripleO::Services::OpenShift::Worker
- imagename: "{{openshift_namespace}}/{{openshift_base_image}}-sti-builder:{{openshift_tag}}"
params:
- DockerOpenShiftStiBuilderImage
services:
- OS::TripleO::Services::OpenShift::Worker
- imagename: "{{openshift_namespace}}/{{openshift_base_image}}-web-console:{{openshift_tag}}"
params:
- DockerOpenShiftWebConsoleImage