openstack/tripleo-common
Code Issues Proposed changes

Tag openshift images for Infra service

Browse Source 
This commit updates the container image services after we've split the
infra service from the master one.

This also fixes missing Worker service for
DockerOpenShiftDeployerImage.

Change-Id: Ibc98e699d34dc6ab9ff6dce0d41f275b6403d983
This commit is contained in:
Martin André
2018-09-17 10:34:11 +02:00
parent 19388f5267
commit 0442e4fe41
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -808,6 +808,7 @@ container_images_template:
params:
- DockerOpenShiftNodeImage
services:
- OS::TripleO::Services::OpenShift::Infra
- OS::TripleO::Services::OpenShift::Master
- OS::TripleO::Services::OpenShift::Worker
@@ -815,7 +816,9 @@ container_images_template:
params:
- DockerOpenShiftDeployerImage
services:
- OS::TripleO::Services::OpenShift::Infra
- OS::TripleO::Services::OpenShift::Master
- OS::TripleO::Services::OpenShift::Worker
- imagename: "{{openshift_namespace}}/{{openshift_base_image}}-docker-builder:{{openshift_tag}}"
params:
@@ -827,20 +830,19 @@ container_images_template:
params:
- DockerOpenShiftDockerRegistryImage
services:
- OS::TripleO::Services::OpenShift::Master
- OS::TripleO::Services::OpenShift::Worker
- OS::TripleO::Services::OpenShift::Infra
- imagename: "{{openshift_namespace}}/{{openshift_base_image}}-haproxy-router:{{openshift_tag}}"
params:
- DockerOpenShiftHAProxyRouterImage
services:
- OS::TripleO::Services::OpenShift::Master
- OS::TripleO::Services::OpenShift::Worker
- OS::TripleO::Services::OpenShift::Infra
- imagename: "{{openshift_namespace}}/{{openshift_base_image}}-pod:{{openshift_tag}}"
params:
- DockerOpenShiftPodImage
services:
- OS::TripleO::Services::OpenShift::Infra
- OS::TripleO::Services::OpenShift::Master
- OS::TripleO::Services::OpenShift::Worker