External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 14:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

add explicit awx_celery container version

Browse Source
This commit is contained in:
chris meyers
2018-02-27 10:52:06 -05:00
parent 5918fa5573
commit 148baf7674
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
installer/inventory
View File

@@ -8,6 +8,7 @@ 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 # 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 dockerhub_version=latest
rabbitmq_version=3.6.14
# This will create or update a default admin (superuser) account in AWX, if not provided # This will create or update a default admin (superuser) account in AWX, if not provided
# then these default values are used # then these default values are used
@@ -93,4 +94,4 @@ pg_port=5432
# AWX project data folder. If you need access to the location where AWX stores the projects # AWX project data folder. If you need access to the location where AWX stores the projects
# it manages from the docker host, you can set this to turn it into a volume for the container. # it manages from the docker host, you can set this to turn it into a volume for the container.
#project_data_dir=/var/lib/awx/projects #project_data_dir=/var/lib/awx/projects

4
installer/openshift/templates/deployment.yml.j2
View File

@@ -33,7 +33,7 @@ spec:
- name: DATABASE_HOST - name: DATABASE_HOST
value: {{ pg_hostname|default('postgresql') }} value: {{ pg_hostname|default('postgresql') }}
- name: DATABASE_PORT - name: DATABASE_PORT
value: {{ pg_port|default(5432) }} value: "{{ pg_port|default('5432') }}"
- name: DATABASE_PASSWORD - name: DATABASE_PASSWORD
value: {{ pg_password }} value: {{ pg_password }}
- name: MEMCACHED_HOST - name: MEMCACHED_HOST
@@ -45,7 +45,7 @@ spec:
- name: AWX_ADMIN_PASSWORD - name: AWX_ADMIN_PASSWORD
value: {{ default_admin_password|default('password') }} value: {{ default_admin_password|default('password') }}
- name: awx-rabbit - name: awx-rabbit
image: ansible/awx_rabbitmq:latest image: ansible/awx_rabbitmq:{{ rabbitmq_version }}
imagePullPolicy: Always imagePullPolicy: Always
env: env:
# For consupmption by rabbitmq-env.conf # For consupmption by rabbitmq-env.conf