diff --git a/installer/inventory b/installer/inventory index b25cd5d44e..c7cd5dd9bd 100644 --- a/installer/inventory +++ b/installer/inventory @@ -7,7 +7,6 @@ localhost ansible_connection=local ansible_python_interpreter="/usr/bin/env pyth # be selected based on: latest, 1, 1.0, 1.0.0, 1.0.0.123 # by default the base will be used to search for ansible/awx_web and ansible/awx_task dockerhub_base=ansible -dockerhub_version=latest # 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 9100e9e537..052224d241 100644 --- a/installer/roles/kubernetes/defaults/main.yml +++ b/installer/roles/kubernetes/defaults/main.yml @@ -1,4 +1,6 @@ --- +dockerhub_version: "{{ lookup('file', playbook_dir + '/../VERSION') }}" + admin_user: 'admin' admin_email: 'root@localhost' admin_password: 'password' diff --git a/installer/roles/local_docker/defaults/main.yml b/installer/roles/local_docker/defaults/main.yml index 76fe95d60f..46905b5095 100644 --- a/installer/roles/local_docker/defaults/main.yml +++ b/installer/roles/local_docker/defaults/main.yml @@ -1,3 +1,5 @@ --- +dockerhub_version: "{{ lookup('file', playbook_dir + '/../VERSION') }}" + rabbitmq_version: "3.7.4" rabbitmq_image: "ansible/awx_rabbitmq:{{rabbitmq_version}}"