commit b4d4f858bb29e297ece13c307ece71441aff5a23
Merge: fd62da8 8b3ff31
Author: Zuul <zuul@review.opendev.org>
Date:   Fri Oct 16 08:11:31 2020 +0000

    Merge "Allow user to override UseDNS in template"

diff --cc templates/container_network.network.j2
index aff4f0a,d31393f..ec99fc9
--- a/templates/container_network.network.j2
+++ b/templates/container_network.network.j2
@@@ -7,12 -7,15 +7,16 @@@ Name={{ item.value.interface }
  Address={{ item.value.address }}/{{ addr_cidr }}
  {% else %}
  [DHCP]
+ {% if item.value.dhcp_use_dns is defined %}
+ UseDNS={{ item.value.dhcp_use_dns | bool | lower }}
+ {% else %}
  UseDNS={{ (lxc_container_enable_resolved | bool) | ternary('yes', 'no') }}
+ {% endif %}
  UseNTP=yes
  RouteMetric=20
 -{% if hostvars[inventory_hostname]['gateway'] is defined %}
 -UseRoutes=False
 +{% if hostvars[inventory_hostname]['gateway'] is defined
 +   or item.value.dhcp_use_routes is defined %}
 +UseRoutes={{ item.value.dhcp_use_routes | default(false) | bool | lower }}
  {% endif %}
  
  {% endif %}