shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-30 22:21:13 +03:00
Code Releases Activity

Merge pull request #651 from tumbl3w33d/646_configurable_search_domains

Browse Source 
Make DNS search domain configurable for awx containers
This commit is contained in:
Matthew Jones 2017-11-15 23:32:16 -05:00 committed by GitHub
commit b06a508ceb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
installer/inventory
View File

@ -72,3 +72,7 @@ pg_port=5432
#http_proxy=http://proxy:3128 #http_proxy=http://proxy:3128
#https_proxy=http://proxy:3128 #https_proxy=http://proxy:3128
#no_proxy=mycorp.org #no_proxy=mycorp.org
# Container networking configuration
# Set the awx_task and awx_web containers' search domain(s)
#awx_container_search_domains=example.com,ansible.com

2
installer/local_docker/tasks/main.yml
View File

@ -167,6 +167,7 @@
- "{{ host_port }}:8052" - "{{ host_port }}:8052"
links: "{{ awx_web_container_links|list }}" links: "{{ awx_web_container_links|list }}"
hostname: awxweb hostname: awxweb
dns_search_domains: "{{ awx_container_search_domains.split(',') if awx_container_search_domains is defined else omit }}"
env: env:
http_proxy: "{{ http_proxy | default('') }}" http_proxy: "{{ http_proxy | default('') }}"
https_proxy: "{{ https_proxy | default('') }}" https_proxy: "{{ https_proxy | default('') }}"
@ -196,6 +197,7 @@
links: "{{ awx_task_container_links|list }}" links: "{{ awx_task_container_links|list }}"
user: root user: root
hostname: awx hostname: awx
dns_search_domains: "{{ awx_container_search_domains.split(',') if awx_container_search_domains is defined else omit }}"
env: env:
http_proxy: "{{ http_proxy | default('') }}" http_proxy: "{{ http_proxy | default('') }}"
https_proxy: "{{ https_proxy | default('') }}" https_proxy: "{{ https_proxy | default('') }}"