External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-18 11:40:05 -03:30
Code Issues Packages Projects Releases Wiki 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
parent 30fb4076df ca7b6ad648
commit 3ee8b3b514
1 changed files with 11 additions and 11 deletions
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 %} {% if ca_trust_dir is defined %}
- "{{ ca_trust_dir +':/etc/pki/ca-trust:ro' }}" - "{{ ca_trust_dir +':/etc/pki/ca-trust:ro' }}"
{% endif %} {% 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(',') %} {% set awx_container_search_domains_list = awx_container_search_domains.split(',') %}
dns_search: dns_search:
{% for awx_container_search_domain in awx_container_search_domains_list %} {% for awx_container_search_domain in awx_container_search_domains_list %}
- {{ awx_container_search_domain }} - {{ awx_container_search_domain }}
{% endfor %} {% endfor %}
{% elif awx_container_search_domains is defined -%} {% elif awx_container_search_domains is defined %}
dns_search: "{{ awx_container_search_domains }}" dns_search: "{{ awx_container_search_domains }}"
{%- endif %} {% endif %}
{% if (awx_alternate_dns_servers is defined) and (',' in awx_alternate_dns_servers) -%} {% if (awx_alternate_dns_servers is defined) and (',' in awx_alternate_dns_servers) %}
{% set awx_alternate_dns_servers_list = awx_alternate_dns_servers.split(',') %} {% set awx_alternate_dns_servers_list = awx_alternate_dns_servers.split(',') %}
dns: dns:
{% for awx_alternate_dns_server in awx_alternate_dns_servers_list %} {% for awx_alternate_dns_server in awx_alternate_dns_servers_list %}
- {{ awx_alternate_dns_server }} - {{ awx_alternate_dns_server }}
{% endfor %} {% endfor %}
{% elif awx_alternate_dns_servers is defined -%} {% elif awx_alternate_dns_servers is defined -%}
dns: "{{ awx_alternate_dns_servers }}" dns: "{{ awx_alternate_dns_servers }}"
{%- endif %} {% endif %}
environment: environment:
http_proxy: {{ http_proxy | default('') }} http_proxy: {{ http_proxy | default('') }}
https_proxy: {{ https_proxy | default('') }} https_proxy: {{ https_proxy | default('') }}
@@ -83,16 +83,16 @@ services:
{% if ca_trust_dir is defined %} {% if ca_trust_dir is defined %}
- "{{ ca_trust_dir +':/etc/pki/ca-trust:ro' }}" - "{{ ca_trust_dir +':/etc/pki/ca-trust:ro' }}"
{% endif %} {% 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(',') %} {% set awx_container_search_domains_list = awx_container_search_domains.split(',') %}
dns_search: dns_search:
{% for awx_container_search_domain in awx_container_search_domains_list %} {% for awx_container_search_domain in awx_container_search_domains_list %}
- {{ awx_container_search_domain }} - {{ awx_container_search_domain }}
{% endfor %} {% endfor %}
{% elif awx_container_search_domains is defined -%} {% elif awx_container_search_domains is defined %}
dns_search: "{{ awx_container_search_domains }}" dns_search: "{{ awx_container_search_domains }}"
{%- endif %} {% endif %}
{% if (awx_alternate_dns_servers is defined) and (',' in awx_alternate_dns_servers) -%} {% if (awx_alternate_dns_servers is defined) and (',' in awx_alternate_dns_servers) %}
{% set awx_alternate_dns_servers_list = awx_alternate_dns_servers.split(',') %} {% set awx_alternate_dns_servers_list = awx_alternate_dns_servers.split(',') %}
dns: dns:
{% for awx_alternate_dns_server in awx_alternate_dns_servers_list %} {% for awx_alternate_dns_server in awx_alternate_dns_servers_list %}
@@ -100,7 +100,7 @@ services:
{% endfor %} {% endfor %}
{% elif awx_alternate_dns_servers is defined -%} {% elif awx_alternate_dns_servers is defined -%}
dns: "{{ awx_alternate_dns_servers }}" dns: "{{ awx_alternate_dns_servers }}"
{%- endif %} {% endif %}
environment: environment:
http_proxy: {{ http_proxy | default('') }} http_proxy: {{ http_proxy | default('') }}
https_proxy: {{ https_proxy | default('') }} https_proxy: {{ https_proxy | default('') }}