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"