Remove image push logic from installer roles

I’m going to be reusing this code on the Tower side, and I’m trying to refactor some of the AWX specific bits out. There will probably be more to come, but this is a good start.
This commit is contained in:
Shane McDonald
2018-04-16 17:56:06 -04:00
parent 2b6fe7969f
commit 40d7751fbd
8 changed files with 74 additions and 77 deletions

View File

@@ -1,4 +1,7 @@
---
dockerhub_web_image: "{{ dockerhub_base | default('ansible') }}/awx_web:{{ dockerhub_version | default('latest') }}"
dockerhub_task_image: "{{ dockerhub_base | default('ansible') }}/awx_task:{{ dockerhub_version | default('latest') }}"
web_mem_request: 1
web_cpu_request: 500
@@ -11,11 +14,11 @@ rabbitmq_cpu_request: 500
memcached_mem_request: 1
memcached_cpu_request: 500
rabbitmq_version: "3.7.4"
rabbitmq_image: "ansible/awx_rabbitmq:{{ rabbitmq_version }}"
kubernetes_rabbitmq_version: "3.7.4"
kubernetes_rabbitmq_image: "ansible/awx_rabbitmq"
memcached_version: "latest"
memcached_image: "memcached:{{ memcached_version }}"
kubernetes_memcached_version: "latest"
kubernetes_memcached_image: "memcached"
openshift_pg_emptydir: no
openshift_pg_pvc_name: postgresql