openstack
/
tripleo-common
Code Issues Proposed changes

Switch to origin-docker-build 

Since OpenShift 3.10, origin-sti-build is deprecated in favor of
origin-docker-builder:

57e7c6c0d4

The new heat parameter for the image is now
DockerOpenShiftDockerBuilderImage.

Change-Id: I46def282e9bd2fd84322c8b9213ac280782f09dd
This commit is contained in:
Martin André 2018-09-03 09:49:25 +02:00
parent d9e27e7826
commit 8bb72cadfe
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
container-images/overcloud_containers.yaml
View File

@ -109,10 +109,10 @@ container_images:
- imagename: docker.io/openshift/origin:v3.10.0
- imagename: docker.io/openshift/node:v3.10.0
- imagename: docker.io/openshift/origin-deployer:v3.10.0
- imagename: docker.io/openshift/origin-docker-builder:v3.10.0
- imagename: docker.io/openshift/origin-docker-registry:v3.10.0
- imagename: docker.io/openshift/origin-haproxy-router:v3.10.0
- imagename: docker.io/openshift/origin-pod:v3.10.0
- imagename: docker.io/openshift/origin-sti-builder:v3.10.0
- imagename: docker.io/openshift/origin-web-console:v3.10.0
- imagename: docker.io/cockpit/kubernetes:latest
- imagename: registry.fedoraproject.org/latest/etcd:latest

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

@ -817,6 +817,12 @@ container_images_template:
services:
- OS::TripleO::Services::OpenShift::Master
- imagename: "{{openshift_namespace}}/{{openshift_base_image}}-docker-builder:{{openshift_tag}}"
params:
- DockerOpenShiftDockerBuilderImage
services:
- OS::TripleO::Services::OpenShift::Worker
- imagename: "{{openshift_namespace}}/{{openshift_base_image}}-docker-registry:{{openshift_tag}}"
params:
- DockerOpenShiftDockerRegistryImage
@ -837,12 +843,6 @@ 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