External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-04 10:11:05 -03:30
Code Issues Packages Projects Releases Wiki Activity

Move rabbitmq and memcached images into variables

Browse Source
This commit is contained in:
Shane McDonald
2018-04-12 00:39:34 -04:00
parent 0786b41ac6
commit 2b6fe7969f
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
installer/roles/kubernetes/defaults/main.yml
View File

@@ -12,6 +12,10 @@ memcached_mem_request: 1
memcached_cpu_request: 500 memcached_cpu_request: 500
rabbitmq_version: "3.7.4" 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_emptydir: no
openshift_pg_pvc_name: postgresql openshift_pg_pvc_name: postgresql

4
installer/roles/kubernetes/templates/deployment.yml.j2
View File

@@ -172,7 +172,7 @@ spec:
memory: "{{ task_mem_request }}Gi" memory: "{{ task_mem_request }}Gi"
cpu: "{{ task_cpu_request }}m" cpu: "{{ task_cpu_request }}m"
- name: {{ kubernetes_deployment_name }}-rabbit - name: {{ kubernetes_deployment_name }}-rabbit
image: ansible/awx_rabbitmq:{{ rabbitmq_version }} image: {{ rabbitmq_image }}
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- name: http - name: http
@@ -212,7 +212,7 @@ spec:
memory: "{{ rabbitmq_mem_request }}Gi" memory: "{{ rabbitmq_mem_request }}Gi"
cpu: "{{ rabbitmq_cpu_request }}m" cpu: "{{ rabbitmq_cpu_request }}m"
- name: {{ kubernetes_deployment_name }}-memcached - name: {{ kubernetes_deployment_name }}-memcached
image: memcached image: {{ memcached_image }}
resources: resources:
requests: requests:
memory: "{{ memcached_mem_request }}Gi" memory: "{{ memcached_mem_request }}Gi"