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

Add inventory vars to set docker install hostnames

Browse Source 
Signed-off-by: walkafwalka <41709139+walkafwalka@users.noreply.github.com>
This commit is contained in:
walkafwalka
2018-08-04 01:49:07 -07:00
parent d40d9f8675
commit d2ab7bd54d
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
installer/inventory
View File

@@ -33,6 +33,8 @@ dockerhub_version=latest
# task_mem_request=2 # task_mem_request=2
# Common Docker parameters # Common Docker parameters
awx_task_hostname=awx
awx_web_hostname=awxweb
postgres_data_dir=/tmp/pgdocker postgres_data_dir=/tmp/pgdocker
host_port=80 host_port=80

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

@@ -89,7 +89,7 @@
ports: ports:
- "{{ host_port }}:8052" - "{{ host_port }}:8052"
links: "{{ awx_web_container_links|list }}" links: "{{ awx_web_container_links|list }}"
hostname: awxweb hostname: "{{ awx_web_hostname }}"
dns_search_domains: "{{ awx_container_search_domains.split(',') if awx_container_search_domains is defined else omit }}" dns_search_domains: "{{ awx_container_search_domains.split(',') if awx_container_search_domains is defined else omit }}"
dns_servers: "{{ awx_alternate_dns_servers.split(',') if awx_alternate_dns_servers is defined else omit }}" dns_servers: "{{ awx_alternate_dns_servers.split(',') if awx_alternate_dns_servers is defined else omit }}"
env: env:
@@ -125,7 +125,7 @@
}} }}
links: "{{ awx_task_container_links|list }}" links: "{{ awx_task_container_links|list }}"
user: root user: root
hostname: awx hostname: "{{ awx_task_hostname }}"
dns_search_domains: "{{ awx_container_search_domains.split(',') if awx_container_search_domains is defined else omit }}" dns_search_domains: "{{ awx_container_search_domains.split(',') if awx_container_search_domains is defined else omit }}"
dns_servers: "{{ awx_alternate_dns_servers.split(',') if awx_alternate_dns_servers is defined else omit }}" dns_servers: "{{ awx_alternate_dns_servers.split(',') if awx_alternate_dns_servers is defined else omit }}"
env: env:

4
installer/roles/local_docker/templates/docker-compose.yml.j2
View File

@@ -12,7 +12,7 @@ services:
{% endif %} {% endif %}
ports: ports:
- "{{ host_port }}:8052" - "{{ host_port }}:8052"
hostname: awxweb hostname: {{ awx_web_hostname }}
user: root user: root
restart: unless-stopped restart: unless-stopped
{% if (project_data_dir is defined) or (ca_trust_dir is defined) %} {% if (project_data_dir is defined) or (ca_trust_dir is defined) %}
@@ -71,7 +71,7 @@ services:
{% if pg_hostname is not defined %} {% if pg_hostname is not defined %}
- postgres - postgres
{% endif %} {% endif %}
hostname: awx hostname: {{ awx_task_hostname }}
user: root user: root
restart: unless-stopped restart: unless-stopped
{% if (project_data_dir is defined) or (ca_trust_dir is defined) %} {% if (project_data_dir is defined) or (ca_trust_dir is defined) %}