External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-02 01:08:48 -03:30
Code Issues Packages Projects Releases Wiki Activity

Do not default to pulling latest from DockerHub

Browse Source
This commit is contained in:
Shane McDonald
2018-10-03 17:50:07 -05:00
parent bfc74497b0
commit b75f8ceca6
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
installer/inventory
View File

@@ -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 # 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 # by default the base will be used to search for ansible/awx_web and ansible/awx_task
dockerhub_base=ansible dockerhub_base=ansible
dockerhub_version=latest
# Openshift Install # Openshift Install
# Will need to set -e openshift_password=developer -e docker_registry_password=$(oc whoami -t) # Will need to set -e openshift_password=developer -e docker_registry_password=$(oc whoami -t)

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

@@ -1,4 +1,6 @@
--- ---
dockerhub_version: "{{ lookup('file', playbook_dir + '/../VERSION') }}"
admin_user: 'admin' admin_user: 'admin'
admin_email: 'root@localhost' admin_email: 'root@localhost'
admin_password: 'password' admin_password: 'password'

2
installer/roles/local_docker/defaults/main.yml
View File

@@ -1,3 +1,5 @@
--- ---
dockerhub_version: "{{ lookup('file', playbook_dir + '/../VERSION') }}"
rabbitmq_version: "3.7.4" rabbitmq_version: "3.7.4"
rabbitmq_image: "ansible/awx_rabbitmq:{{rabbitmq_version}}" rabbitmq_image: "ansible/awx_rabbitmq:{{rabbitmq_version}}"