From 92433d5c919769104f7ea51598c7f0d5f10d0553 Mon Sep 17 00:00:00 2001
From: Ade Lee <alee@redhat.com>
Date: Tue, 25 Feb 2020 14:35:53 -0500
Subject: [PATCH] Add DNS related settings

Looks like we missed some network templates when setting DNSSearchDomains
and DNSServers

Change-Id: Ic5784cc20e102afa10ddb90cdf288305bfb72049
(cherry picked from commit 6bc38da3e360d5cf38057c919af34b0ec1528126)
---
 net-config-bridge.j2.yaml                           | 8 ++++++++
 net-config-linux-bridge.j2.yaml                     | 9 +++++++++
 net-config-static-bridge-with-external-dhcp.j2.yaml | 8 ++++++++
 3 files changed, 25 insertions(+)

diff --git a/net-config-bridge.j2.yaml b/net-config-bridge.j2.yaml
index 3f12542656..53bf12cb3d 100644
--- a/net-config-bridge.j2.yaml
+++ b/net-config-bridge.j2.yaml
@@ -38,6 +38,10 @@ parameters:
       If not set the nameservers configured in the ctlplane subnet's
       dns_nameservers attribute will be used.
     type: comma_delimited_list
+  DnsSearchDomains: # Override this via parameter_defaults
+    default: []
+    description: A list of DNS search domains to be added (in order) to resolv.conf.
+    type: comma_delimited_list
   {%- for network in networks %}
   {{network.name}}IpSubnet:
     default: ''
@@ -81,6 +85,10 @@ resources:
               - type: ovs_bridge
                 name: bridge_name
                 use_dhcp: true
+                dns_servers:
+                  get_param: DnsServers
+                domain:
+                  get_param: DnsSearchDomains
                 members:
                 - type: interface
                   name: interface_name
diff --git a/net-config-linux-bridge.j2.yaml b/net-config-linux-bridge.j2.yaml
index 7b6c69b18e..6bda9be5da 100644
--- a/net-config-linux-bridge.j2.yaml
+++ b/net-config-linux-bridge.j2.yaml
@@ -66,6 +66,11 @@ parameters:
       If not set the nameservers configured in the ctlplane subnet's
       dns_nameservers attribute will be used.
     type: comma_delimited_list
+  DnsSearchDomains: # Override this via parameter_defaults
+    default: []
+    description: A list of DNS search domains to be added (in order) to resolv.conf.
+    type: comma_delimited_list
+
 
 resources:
   OsNetConfigImpl:
@@ -84,6 +89,10 @@ resources:
                 addresses:
                 - ip_netmask:
                     get_param: ControlPlaneIp
+                dns_servers:
+                  get_param: DnsServers
+                domain:
+                  get_param: DnsSearchDomains
                 members:
                 - type: interface
                   name: interface_name
diff --git a/net-config-static-bridge-with-external-dhcp.j2.yaml b/net-config-static-bridge-with-external-dhcp.j2.yaml
index 8ffa932a03..ceb937e51f 100644
--- a/net-config-static-bridge-with-external-dhcp.j2.yaml
+++ b/net-config-static-bridge-with-external-dhcp.j2.yaml
@@ -67,6 +67,10 @@ parameters:
       If not set the nameservers configured in the ctlplane subnet's
       dns_nameservers attribute will be used.
     type: comma_delimited_list
+  DnsSearchDomains: # Override this via parameter_defaults
+    default: []
+    description: A list of DNS search domains to be added (in order) to resolv.conf.
+    type: comma_delimited_list
 
 resources:
   OsNetConfigImpl:
@@ -83,6 +87,10 @@ resources:
               - type: ovs_bridge
                 name: bridge_name
                 use_dhcp: true
+                dns_servers:
+                  get_param: DnsServers
+                domain:
+                  get_param: DnsSearchDomains
                 members:
                 - type: interface
                   name: interface_name