Merge pull request ansible#651 from tumbl3w33d/646_configurable_searc…

…h_domains Make DNS search domain configurable for awx containers
EagleIJoe · Nov 16, 2017 · b06a508 · b06a508
2 parents d6b10b7 + c1aa412
commit b06a508
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/installer/inventory b/installer/inventory
@@ -72,3 +72,7 @@ pg_port=5432
 #http_proxy=http://proxy:3128
 #https_proxy=http://proxy:3128
 #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
diff --git a/installer/local_docker/tasks/main.yml b/installer/local_docker/tasks/main.yml
@@ -167,6 +167,7 @@
       - "{{ host_port }}:8052"
     links: "{{ awx_web_container_links|list }}"
     hostname: awxweb
+    dns_search_domains: "{{ awx_container_search_domains.split(',') if awx_container_search_domains is defined else omit }}"
     env:
       http_proxy: "{{ http_proxy | default('') }}"
       https_proxy: "{{ https_proxy | default('') }}"
@@ -196,6 +197,7 @@
     links: "{{ awx_task_container_links|list }}"
     user: root
     hostname: awx
+    dns_search_domains: "{{ awx_container_search_domains.split(',') if awx_container_search_domains is defined else omit }}"
     env:
       http_proxy: "{{ http_proxy | default('') }}"
       https_proxy: "{{ https_proxy | default('') }}"