From e6a53443a640271487bbf7da76547ab3fd5dc9ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Fri, 5 Oct 2018 18:27:17 +0200 Subject: [PATCH] Add openshift-ansible container image This is used to deploy an openshift environment from TripleO. Change-Id: I998cf54a737fcbde1e6c2078b80ba829f94e7390 --- container-images/overcloud_containers.yaml | 1 + container-images/overcloud_containers.yaml.j2 | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/container-images/overcloud_containers.yaml b/container-images/overcloud_containers.yaml index 0b24b1d59..024736c9e 100644 --- a/container-images/overcloud_containers.yaml +++ b/container-images/overcloud_containers.yaml @@ -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 diff --git a/container-images/overcloud_containers.yaml.j2 b/container-images/overcloud_containers.yaml.j2 index 2acd00f0b..2d3ee49e5 100644 --- a/container-images/overcloud_containers.yaml.j2 +++ b/container-images/overcloud_containers.yaml.j2 @@ -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