From 2e9309560e642150a9cca8d99131544cee5177c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Andr=C3=A9?= <m.andre@redhat.com>
Date: Fri, 13 Jul 2018 16:49:46 +0200
Subject: [PATCH] Set container images for CNS

These are the container images for running the
OS::TripleO::Services::OpenShift::GlusterFS role.

Depends-On: I1e541c82d48e3e80895e9c39aab62080d8bf48ce
Change-Id: Icb02faf6075f46a90e72c1f01af5bd8f7836acd0
---
 extraconfig/services/openshift-cns.yaml | 52 +++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/extraconfig/services/openshift-cns.yaml b/extraconfig/services/openshift-cns.yaml
index 7e63d47d9a..01c9424f4c 100644
--- a/extraconfig/services/openshift-cns.yaml
+++ b/extraconfig/services/openshift-cns.yaml
@@ -41,6 +41,15 @@ parameters:
     type: comma_delimited_list
     tags:
       - role_specific
+  DockerOpenShiftGlusterFSImage:
+    description: Container image to use for GlusterFS pod
+    type: string
+  DockerOpenShiftGlusterFSBlockImage:
+    description: Container image to use for glusterblock-provisioner pod
+    type: string
+  DockerOpenShiftGlusterFSHeketiImage:
+    description: Container image to use for heketi pods
+    type: string
 
 resources:
   RoleParametersValue:
@@ -97,6 +106,46 @@ outputs:
               set_fact:
                 openshift_gluster_disks: {get_attr: [RoleParametersValue, value, OpenShiftGlusterDisks]}
 
+            - name: set openshift images vars fact
+              set_fact:
+                openshift_gluster_images:
+                  openshift_storage_glusterfs_image:
+                    yaql:
+                      expression:
+                        $.data.image.rightSplit(":", 1)[0]
+                      data:
+                        image: {get_param: DockerOpenShiftGlusterFSImage}
+                  openshift_storage_glusterfs_version:
+                    yaql:
+                      expression:
+                        $.data.image.rightSplit(":", 1)[1]
+                      data:
+                        image: {get_param: DockerOpenShiftGlusterFSImage}
+                  openshift_storage_glusterfs_block_image:
+                    yaql:
+                      expression:
+                        $.data.image.rightSplit(":", 1)[0]
+                      data:
+                        image: {get_param: DockerOpenShiftGlusterFSBlockImage}
+                  openshift_storage_glusterfs_block_version:
+                    yaql:
+                      expression:
+                        $.data.image.rightSplit(":", 1)[1]
+                      data:
+                        image: {get_param: DockerOpenShiftGlusterFSBlockImage}
+                  openshift_storage_glusterfs_heketi_image:
+                    yaql:
+                      expression:
+                        $.data.image.rightSplit(":", 1)[0]
+                      data:
+                        image: {get_param: DockerOpenShiftGlusterFSHeketiImage}
+                  openshift_storage_glusterfs_heketi_version:
+                    yaql:
+                      expression:
+                        $.data.image.rightSplit(":", 1)[1]
+                      data:
+                        image: {get_param: DockerOpenShiftGlusterFSHeketiImage}
+
             - name: generate openshift inventory for openshift_glusterfs service
               lineinfile:
                 path: "{{playbook_dir}}/openshift/inventory/openshift_glusterfs.ini"
@@ -138,3 +187,6 @@ outputs:
                             ansible_become: true
                             openshift_schedulable: true
                           {% endfor %}
+
+                        vars:
+                          {{openshift_gluster_images | to_nice_yaml() | indent(4) }}