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

Merge pull request #2235 from ChrisRo89/devel

Browse Source 
Extracted more variables which a related to rabbitmq/postgresql from tasks to defaults

Reviewed-by: Shane McDonald <me@shanemcd.com>
             https://github.com/shanemcd
This commit is contained in:
softwarefactory-project-zuul[bot]
2018-10-11 21:54:38 +00:00
committed by GitHub
parent 9a580ba644 96ad2b2b28
commit 99a42e91fe
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,3 +3,11 @@ 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}}"
rabbitmq_default_vhost: "awx"
rabbitmq_erlang_cookie: "cookiemonster"
rabbitmq_port: "5672"
rabbitmq_default_username: "guest"
rabbitmq_default_password: "guest"
postgresql_version: "9.6"
postgresql_image: "postgres:{{postgresql_version}}"

24
installer/roles/local_docker/tasks/standalone.yml
View File

@@ -4,7 +4,7 @@
name: postgres name: postgres
state: started state: started
restart_policy: unless-stopped restart_policy: unless-stopped
image: postgres:9.6 image: "{{ postgresql_image }}"
volumes: volumes:
- "{{ postgres_data_dir }}:/var/lib/postgresql/data:Z" - "{{ postgres_data_dir }}:/var/lib/postgresql/data:Z"
env: env:
@@ -22,8 +22,10 @@
restart_policy: unless-stopped restart_policy: unless-stopped
image: "{{ rabbitmq_image }}" image: "{{ rabbitmq_image }}"
env: env:
RABBITMQ_DEFAULT_VHOST: "awx" RABBITMQ_DEFAULT_VHOST: "{{ rabbitmq_default_vhost }}"
RABBITMQ_ERLANG_COOKIE: "cookiemonster" RABBITMQ_ERLANG_COOKIE: "{{ rabbitmq_erlang_cookie }}"
RABBITMQ_DEFAULT_USER: "{{ rabbitmq_default_username }}"
RABBITMQ_DEFAULT_PASS: "{{ rabbitmq_default_password }}"
register: rabbitmq_container_activate register: rabbitmq_container_activate
- name: Activate memcached container - name: Activate memcached container
@@ -100,11 +102,11 @@
DATABASE_PASSWORD: "{{ pg_password }}" DATABASE_PASSWORD: "{{ pg_password }}"
DATABASE_PORT: "{{ pg_port }}" DATABASE_PORT: "{{ pg_port }}"
DATABASE_HOST: "{{ pg_hostname_actual }}" DATABASE_HOST: "{{ pg_hostname_actual }}"
RABBITMQ_USER: "guest" RABBITMQ_USER: "{{ rabbitmq_default_username }}"
RABBITMQ_PASSWORD: "guest" RABBITMQ_PASSWORD: "{{ rabbitmq_default_password }}"
RABBITMQ_HOST: "rabbitmq" RABBITMQ_HOST: "rabbitmq"
RABBITMQ_PORT: "5672" RABBITMQ_PORT: "{{ rabbitmq_port }}"
RABBITMQ_VHOST: "awx" RABBITMQ_VHOST: "{{ rabbitmq_default_vhost }}"
MEMCACHED_HOST: "memcached" MEMCACHED_HOST: "memcached"
MEMCACHED_PORT: "11211" MEMCACHED_PORT: "11211"
AWX_ADMIN_USER: "{{ default_admin_user|default('admin') }}" AWX_ADMIN_USER: "{{ default_admin_user|default('admin') }}"
@@ -141,11 +143,11 @@
DATABASE_PASSWORD: "{{ pg_password }}" DATABASE_PASSWORD: "{{ pg_password }}"
DATABASE_HOST: "{{ pg_hostname_actual }}" DATABASE_HOST: "{{ pg_hostname_actual }}"
DATABASE_PORT: "{{ pg_port }}" DATABASE_PORT: "{{ pg_port }}"
RABBITMQ_USER: "guest" RABBITMQ_USER: "{{ rabbitmq_default_username }}"
RABBITMQ_PASSWORD: "guest" RABBITMQ_PASSWORD: "{{ rabbitmq_default_password }}"
RABBITMQ_HOST: "rabbitmq" RABBITMQ_HOST: "rabbitmq"
RABBITMQ_PORT: "5672" RABBITMQ_PORT: "{{ rabbitmq_port }}"
RABBITMQ_VHOST: "awx" RABBITMQ_VHOST: "{{ rabbitmq_default_vhost }}"
MEMCACHED_HOST: "memcached" MEMCACHED_HOST: "memcached"
MEMCACHED_PORT: "11211" MEMCACHED_PORT: "11211"
AWX_ADMIN_USER: "{{ default_admin_user|default('admin') }}" AWX_ADMIN_USER: "{{ default_admin_user|default('admin') }}"