From 2b6fe7969fc2ece2a475bf3378d2608c118e9cb6 Mon Sep 17 00:00:00 2001
From: Shane McDonald <me@shanemcd.com>
Date: Thu, 12 Apr 2018 00:39:34 -0400
Subject: [PATCH] Move rabbitmq and memcached images into variables

---
 installer/roles/kubernetes/defaults/main.yml           | 4 ++++
 installer/roles/kubernetes/templates/deployment.yml.j2 | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/installer/roles/kubernetes/defaults/main.yml b/installer/roles/kubernetes/defaults/main.yml
index a3076116e5..85dbcdaef6 100644
--- a/installer/roles/kubernetes/defaults/main.yml
+++ b/installer/roles/kubernetes/defaults/main.yml
@@ -12,6 +12,10 @@ memcached_mem_request: 1
 memcached_cpu_request: 500
 
 rabbitmq_version: "3.7.4"
+rabbitmq_image: "ansible/awx_rabbitmq:{{ rabbitmq_version }}"
+
+memcached_version: "latest"
+memcached_image: "memcached:{{ memcached_version }}"
 
 openshift_pg_emptydir: no
 openshift_pg_pvc_name: postgresql
diff --git a/installer/roles/kubernetes/templates/deployment.yml.j2 b/installer/roles/kubernetes/templates/deployment.yml.j2
index bb44542030..b9c3f95101 100644
--- a/installer/roles/kubernetes/templates/deployment.yml.j2
+++ b/installer/roles/kubernetes/templates/deployment.yml.j2
@@ -172,7 +172,7 @@ spec:
               memory: "{{ task_mem_request }}Gi"
               cpu: "{{ task_cpu_request }}m"
         - name: {{ kubernetes_deployment_name }}-rabbit
-          image: ansible/awx_rabbitmq:{{ rabbitmq_version }}
+          image: {{ rabbitmq_image }}
           imagePullPolicy: Always
           ports:
             - name: http
@@ -212,7 +212,7 @@ spec:
               memory: "{{ rabbitmq_mem_request }}Gi"
               cpu: "{{ rabbitmq_cpu_request }}m"
         - name: {{ kubernetes_deployment_name }}-memcached
-          image: memcached
+          image: {{ memcached_image }}
           resources:
             requests:
               memory: "{{ memcached_mem_request }}Gi"