shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 16:51:11 +03:00
Code Releases Activity

Merge pull request #1613 from EagleIJoe/patch-1

Browse Source 
Corrected alternate dns servers entries in docker-compose template
This commit is contained in:
Matthew Jones 2018-03-20 07:24:31 -07:00 committed by GitHub
commit 3ee8b3b514
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,24 +24,24 @@ services:
{% if ca_trust_dir is defined %}
- "{{ ca_trust_dir +':/etc/pki/ca-trust:ro' }}"
{% endif %}
{% if (awx_container_search_domains is defined) and (',' in awx_container_search_domains) -%}
{% if (awx_container_search_domains is defined) and (',' in awx_container_search_domains) %}
{% set awx_container_search_domains_list = awx_container_search_domains.split(',') %}
dns_search:
{% for awx_container_search_domain in awx_container_search_domains_list %}
- {{ awx_container_search_domain }}
{% endfor %}
{% elif awx_container_search_domains is defined -%}
{% elif awx_container_search_domains is defined %}
dns_search: "{{ awx_container_search_domains }}"
{%- endif %}
{% if (awx_alternate_dns_servers is defined) and (',' in awx_alternate_dns_servers) -%}
{% endif %}
{% if (awx_alternate_dns_servers is defined) and (',' in awx_alternate_dns_servers) %}
{% set awx_alternate_dns_servers_list = awx_alternate_dns_servers.split(',') %}
dns:
{% for awx_alternate_dns_server in awx_alternate_dns_servers_list %}
- {{ awx_alternate_dns_server }}
{% endfor %}
{% elif awx_alternate_dns_servers is defined -%}
dns: "{{ awx_alternate_dns_servers }}"
{%- endif %}
dns: "{{ awx_alternate_dns_servers }}"
{% endif %}
environment:
http_proxy: {{ http_proxy | default('') }}
https_proxy: {{ https_proxy | default('') }}
@ -83,16 +83,16 @@ services:
{% if ca_trust_dir is defined %}
- "{{ ca_trust_dir +':/etc/pki/ca-trust:ro' }}"
{% endif %}
{% if (awx_container_search_domains is defined) and (',' in awx_container_search_domains) -%}
{% if (awx_container_search_domains is defined) and (',' in awx_container_search_domains) %}
{% set awx_container_search_domains_list = awx_container_search_domains.split(',') %}
dns_search:
{% for awx_container_search_domain in awx_container_search_domains_list %}
- {{ awx_container_search_domain }}
{% endfor %}
{% elif awx_container_search_domains is defined -%}
{% elif awx_container_search_domains is defined %}
dns_search: "{{ awx_container_search_domains }}"
{%- endif %}
{% if (awx_alternate_dns_servers is defined) and (',' in awx_alternate_dns_servers) -%}
{% endif %}
{% if (awx_alternate_dns_servers is defined) and (',' in awx_alternate_dns_servers) %}
{% set awx_alternate_dns_servers_list = awx_alternate_dns_servers.split(',') %}
dns:
{% for awx_alternate_dns_server in awx_alternate_dns_servers_list %}
@ -100,7 +100,7 @@ services:
{% endfor %}
{% elif awx_alternate_dns_servers is defined -%}
dns: "{{ awx_alternate_dns_servers }}"
{%- endif %}
{% endif %}
environment:
http_proxy: {{ http_proxy | default('') }}
https_proxy: {{ https_proxy | default('') }}