From 9d53ff37713d1192dc1c7c0b3b4f1832c9c7b29d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Andr=C3=A9?= <m.andre@redhat.com>
Date: Mon, 3 Dec 2018 10:30:19 +0100
Subject: [PATCH] Additional images for openshift services

This commit adds missing images for openshift service catalog and
template service broker. These two services are enabled by default by
openshift-ansible and as a result, tripleo should deploy them in its
default setting too (they were explicitly disabled in tht until now).

Change-Id: Ic358ed27d63015d297f50c10f553fc1c470ea6a5
Partial-Bug: #1806353
---
 .../container_image_prepare_defaults.yaml     |  2 ++
 container-images/overcloud_containers.yaml    |  6 ++++++
 container-images/overcloud_containers.yaml.j2 | 21 +++++++++++++++++++
 .../tests/image/test_kolla_builder.py         |  8 +++++++
 4 files changed, 37 insertions(+)

diff --git a/container-images/container_image_prepare_defaults.yaml b/container-images/container_image_prepare_defaults.yaml
index 90d3fa48f..0b5e9c1ac 100644
--- a/container-images/container_image_prepare_defaults.yaml
+++ b/container-images/container_image_prepare_defaults.yaml
@@ -47,6 +47,8 @@ parameter_defaults:
       openshift_heketi_namespace: docker.io/heketi
       openshift_heketi_image: heketi
       openshift_heketi_tag: latest
+      openshift_asb_namespace: docker.io/ansibleplaybookbundle
+      openshift_asb_tag: latest
       openshift_cluster_monitoring_namespace: quay.io/coreos
       openshift_cluster_monitoring_image: cluster-monitoring-operator
       openshift_cluster_monitoring_tag: v0.1.1
diff --git a/container-images/overcloud_containers.yaml b/container-images/overcloud_containers.yaml
index 0f7072574..fa7c2f3bb 100644
--- a/container-images/overcloud_containers.yaml
+++ b/container-images/overcloud_containers.yaml
@@ -235,6 +235,12 @@ container_images:
   image_source: openshift
 - imagename: docker.io/openshift/origin-pod:v3.11.0
   image_source: openshift
+- imagename: docker.io/openshift/origin-service-catalog:v3.11.0
+  image_source: openshift
+- imagename: docker.io/openshift/origin-template-service-broker:v3.11.0
+  image_source: openshift
+- imagename: docker.io/ansibleplaybookbundle/origin-ansible-service-broker:latest
+  image_source: openshift
 - imagename: docker.io/openshift/origin-web-console:v3.11.0
   image_source: openshift
 - imagename: docker.io/cockpit/kubernetes:latest
diff --git a/container-images/overcloud_containers.yaml.j2 b/container-images/overcloud_containers.yaml.j2
index 0019f3d1a..a309aaac1 100644
--- a/container-images/overcloud_containers.yaml.j2
+++ b/container-images/overcloud_containers.yaml.j2
@@ -991,6 +991,27 @@ container_images_template:
   - OS::TripleO::Services::OpenShift::Master
   - OS::TripleO::Services::OpenShift::Worker
 
+- imagename: "{{openshift_namespace}}/{{openshift_prefix}}-service-catalog:{{openshift_tag}}"
+  image_source: openshift
+  params:
+  - DockerOpenShiftServiceCatalogImage
+  services:
+  - OS::TripleO::Services::OpenShift::Master
+
+- imagename: "{{openshift_namespace}}/{{openshift_prefix}}-template-service-broker:{{openshift_tag}}"
+  image_source: openshift
+  params:
+  - DockerOpenShiftTemplateServiceBrokerImage
+  services:
+  - OS::TripleO::Services::OpenShift::Master
+
+- imagename: "{{openshift_asb_namespace}}/{{openshift_prefix}}-ansible-service-broker:{{openshift_asb_tag}}"
+  image_source: openshift
+  params:
+  - DockerOpenShiftAnsibleServiceBrokerImage
+  services:
+  - OS::TripleO::Services::OpenShift::Infra
+
 - imagename: "{{openshift_namespace}}/{{openshift_prefix}}-web-console:{{openshift_tag}}"
   image_source: openshift
   params:
diff --git a/tripleo_common/tests/image/test_kolla_builder.py b/tripleo_common/tests/image/test_kolla_builder.py
index 75f708106..a768ff7f8 100644
--- a/tripleo_common/tests/image/test_kolla_builder.py
+++ b/tripleo_common/tests/image/test_kolla_builder.py
@@ -233,6 +233,8 @@ class TestKollaImageBuilderTemplate(base.TestCase):
                 'openshift_heketi_namespace': 'docker.io/heketi',
                 'openshift_heketi_image': 'heketi',
                 'openshift_heketi_tag': 'latest',
+                'openshift_asb_namespace': 'docker.io/ansibleplaybookbundle',
+                'openshift_asb_tag': 'latest',
                 'openshift_cluster_monitoring_namespace': 'quay.io/coreos',
                 'openshift_cluster_monitoring_image':
                     'cluster-monitoring-operator',
@@ -293,6 +295,9 @@ class TestKollaImageBuilderTemplate(base.TestCase):
                     'registry.access.redhat.com/rhgs3',
                 'openshift_heketi_image': 'rhgs-volmanager-rhel7',
                 'openshift_heketi_tag': 'heketi-tag',
+                'openshift_asb_namespace':
+                    'registry.access.redhat.com/openshift3',
+                'openshift_asb_tag': 'v3.11',
                 'openshift_cluster_monitoring_namespace':
                     'registry.access.redhat.com/openshift3',
                 'openshift_cluster_monitoring_image':
@@ -353,6 +358,9 @@ class TestKollaImageBuilderTemplate(base.TestCase):
                 openshift_heketi_namespace='registry.access.redhat.com/rhgs3',
                 openshift_heketi_image='rhgs-volmanager-rhel7',
                 openshift_heketi_tag='heketi-tag',
+                openshift_asb_namespace='registry.'
+                    'access.redhat.com/openshift3',
+                openshift_asb_tag='v3.11',
                 openshift_cluster_monitoring_namespace='registry.'
                     'access.redhat.com/openshift3',
                 openshift_cluster_monitoring_image='ose-'