From c8ea03e67b52e3af080e027f8e200bc1a501f8dd Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Wed, 28 Mar 2018 12:45:05 -0400 Subject: [PATCH] Move rabbitmq_version out of inventory file Signed-off-by: Shane McDonald --- installer/inventory | 1 - installer/roles/kubernetes/defaults/main.yml | 2 ++ installer/roles/local_docker/defaults/main.yml | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/installer/inventory b/installer/inventory index 896b21bac7..72b10f8326 100644 --- a/installer/inventory +++ b/installer/inventory @@ -8,7 +8,6 @@ localhost ansible_connection=local ansible_python_interpreter="/usr/bin/env pyth # by default the base will be used to search for ansible/awx_web and ansible/awx_task dockerhub_base=ansible dockerhub_version=latest -rabbitmq_version=3.7.4 # Openshift Install # Will need to set -e openshift_password=developer -e docker_registry_password=$(oc whoami -t) diff --git a/installer/roles/kubernetes/defaults/main.yml b/installer/roles/kubernetes/defaults/main.yml index 0cd687fb96..594648474f 100644 --- a/installer/roles/kubernetes/defaults/main.yml +++ b/installer/roles/kubernetes/defaults/main.yml @@ -1,4 +1,6 @@ --- +rabbitmq_version: "3.7.4" + awx_web_mem_request: 1 awx_web_cpu_request: 500 diff --git a/installer/roles/local_docker/defaults/main.yml b/installer/roles/local_docker/defaults/main.yml index 90a8d615dc..76fe95d60f 100644 --- a/installer/roles/local_docker/defaults/main.yml +++ b/installer/roles/local_docker/defaults/main.yml @@ -1 +1,3 @@ +--- +rabbitmq_version: "3.7.4" rabbitmq_image: "ansible/awx_rabbitmq:{{rabbitmq_version}}"