openstack/tripleo-common
Code Issues Proposed changes

Merge "Add openshift-ansible container image"

Browse Source
This commit is contained in:
Zuul 2018-10-15 12:49:50 +00:00 committed by Gerrit Code Review
commit 9f7d814333
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

@ -108,6 +108,7 @@ container_images:
- imagename: docker.io/tripleomaster/centos-binary-rsyslog-base:current-tripleo
- imagename: docker.io/openshift/origin:v3.10.0
- imagename: docker.io/openshift/node:v3.10.0
- imagename: docker.io/openshift/origin-ansible: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

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

@ -812,6 +812,12 @@ container_images_template:
- OS::TripleO::Services::OpenShift::Master
- OS::TripleO::Services::OpenShift::Worker
- imagename: "{{openshift_namespace}}/{{openshift_base_image}}-ansible:{{openshift_tag}}"
params:
- DockerOpenShiftAnsibleImage
services:
- OS::TripleO::Services::OpenShift::Master
- imagename: "{{openshift_namespace}}/{{openshift_base_image}}-deployer:{{openshift_tag}}"
params:
- DockerOpenShiftDeployerImage