Add container images needed for OpenShift

This maps the OpenShift container images to their corresponding TripleO
service.

Reuse the etcd image that is already in use for OpenStack.

Change-Id: I58a5d2e5dd7354bea99e2639da3b6169dbb54514

container-images/overcloud_containers.yaml

@@ -106,3 +106,11 @@ container_images:
 - imagename: docker.io/ceph/daemon:v3.0.3-stable-3.0-luminous-centos-7-x86_64
 - imagename: docker.io/tripleomaster/centos-binary-tempest:current-tripleo
 - imagename: docker.io/tripleomaster/centos-binary-rsyslog-base:current-tripleo
+- imagename: docker.io/openshift/origin:v3.9.0
+- imagename: docker.io/openshift/node:v3.9.0
+- imagename: docker.io/openshift/origin-deployer:v3.9.0
+- 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-web-console:v3.9.0
+- imagename: docker.io/cockpit/kubernetes:latest

container-images/overcloud_containers.yaml.j2

@@ -208,6 +208,7 @@ container_images_template:
   - DockerEtcdImage
   services:
   - OS::TripleO::Services::Etcd
+  - OS::TripleO::Services::OpenShift::Master
 
 - imagename: "{{namespace}}/{{name_prefix}}fluentd{{name_suffix}}:{{tag}}"
   params:
@@ -790,3 +791,54 @@ container_images_template:
   - OS::TripleO::Services::HAproxy
   - OS::TripleO::Services::SwiftProxy
   - OS::TripleO::Services::SwiftStorage
+
+- imagename: "{{openshift_namespace}}/{{openshift_base_image}}:{{openshift_tag}}"
+  params:
+  - DockerOpenShiftBaseImage
+  services:
+  - OS::TripleO::Services::OpenShift::Master
+
+- imagename: "{{openshift_namespace}}/node:{{openshift_tag}}"
+  params:
+  - DockerOpenShiftNodeImage
+  services:
+  - OS::TripleO::Services::OpenShift::Master
+  - OS::TripleO::Services::OpenShift::Worker
+
+- imagename: "{{openshift_namespace}}/{{openshift_base_image}}-deployer:{{openshift_tag}}"
+  params:
+  - DockerOpenShiftDeployerImage
+  services:
+  - OS::TripleO::Services::OpenShift::Master
+
+- imagename: "{{openshift_namespace}}/{{openshift_base_image}}-docker-registry:{{openshift_tag}}"
+  params:
+  - DockerOpenShiftDockerRegistryImage
+  services:
+  - OS::TripleO::Services::OpenShift::Worker
+
+- imagename: "{{openshift_namespace}}/{{openshift_base_image}}-haproxy-router:{{openshift_tag}}"
+  params:
+  - DockerOpenShiftHAProxyRouterImage
+  services:
+  - OS::TripleO::Services::OpenShift::Master
+  - OS::TripleO::Services::OpenShift::Worker
+
+- imagename: "{{openshift_namespace}}/{{openshift_base_image}}-pod:{{openshift_tag}}"
+  params:
+  - DockerOpenShiftPodImage
+  services:
+  - OS::TripleO::Services::OpenShift::Master
+  - OS::TripleO::Services::OpenShift::Worker
+
+- imagename: "{{openshift_namespace}}/{{openshift_base_image}}-web-console:{{openshift_tag}}"
+  params:
+  - DockerOpenShiftWebConsoleImage
+  services:
+  - OS::TripleO::Services::OpenShift::Master
+
+- imagename: "{{openshift_cockpit_namespace}}/{{openshift_cockpit_image}}:{{openshift_cockpit_tag}}"
+  params:
+  - DockerOpenShiftCockpitImage
+  services:
+  - OS::TripleO::Services::OpenShift::Master

tripleo_common/image/kolla_builder.py

@@ -38,6 +38,12 @@ CONTAINER_IMAGE_PREPARE_PARAM = [{
         'name_suffix': '',
         'tag': 'current-tripleo',
         'neutron_driver': None,
+        'openshift_namespace': 'docker.io/openshift',
+        'openshift_tag': 'v3.9.0',
+        'openshift_base_image': 'origin',
+        'openshift_cockpit_namespace': 'docker.io/cockpit',
+        'openshift_cockpit_image': 'kubernetes',
+        'openshift_cockpit_tag': 'latest',
     }
 }]
 

tripleo_common/tests/image/test_kolla_builder.py

@@ -171,7 +171,13 @@ class TestKollaImageBuilderTemplate(base.TestCase):
                 'name_prefix': 'centos-binary-',
                 'name_suffix': '',
                 'tag': 'current-tripleo',
-                'neutron_driver': None
+                'neutron_driver': None,
+                'openshift_namespace': 'docker.io/openshift',
+                'openshift_tag': 'v3.9.0',
+                'openshift_base_image': 'origin',
+                'openshift_cockpit_namespace': 'docker.io/cockpit',
+                'openshift_cockpit_image': 'kubernetes',
+                'openshift_cockpit_tag': 'latest',
             },
             builder.container_images_template_inputs()
         )
@@ -185,7 +191,13 @@ class TestKollaImageBuilderTemplate(base.TestCase):
                 'name_prefix': 'prefix-',
                 'name_suffix': '-suffix',
                 'tag': 'master',
-                'neutron_driver': 'ovn'
+                'neutron_driver': 'ovn',
+                'openshift_namespace': 'docker.io/openshift3',
+                'openshift_tag': 'v3.10.0',
+                'openshift_base_image': 'ose',
+                'openshift_cockpit_namespace': 'docker.io/openshift-cockpit',
+                'openshift_cockpit_image': 'cockpit',
+                'openshift_cockpit_tag': 'tag',
             },
             builder.container_images_template_inputs(
                 namespace='192.0.2.0:5000/tripleomaster',
@@ -196,6 +208,12 @@ class TestKollaImageBuilderTemplate(base.TestCase):
                 name_suffix='suffix',
                 tag='master',
                 neutron_driver='ovn',
+                openshift_namespace='docker.io/openshift3',
+                openshift_tag='v3.10.0',
+                openshift_base_image='ose',
+                openshift_cockpit_namespace='docker.io/openshift-cockpit',
+                openshift_cockpit_image='cockpit',
+                openshift_cockpit_tag='tag',
             )
         )