Merge "Add ability to specify dns search domains"

ci/environments/network/multiple-nics-ipv6/nic-configs/compute-dvr.yaml

@@ -108,6 +108,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
   EC2MetadataIp:
     default: ''
     description: The IP address of the EC2 metadata server. (The parameter
@@ -158,6 +162,7 @@ resources:
               - type: ovs_bridge
                 name: br-tenant
                 dns_servers: {get_param: DnsServers}
+                domain: {get_param: DnsSearchDomains}
                 use_dhcp: false
                 addresses:
                 - ip_netmask: {get_param: TenantIpSubnet}

ci/environments/network/multiple-nics-ipv6/nic-configs/compute.yaml

@@ -108,6 +108,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
   EC2MetadataIp:
     default: ''
     description: The IP address of the EC2 metadata server. (The parameter
@@ -153,6 +157,7 @@ resources:
               - type: ovs_bridge
                 name: br-tenant
                 dns_servers: {get_param: DnsServers}
+                domain: {get_param: DnsSearchDomains}
                 use_dhcp: false
                 addresses:
                 - ip_netmask: {get_param: TenantIpSubnet}

ci/environments/network/multiple-nics-ipv6/nic-configs/controller.yaml

@@ -156,6 +156,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
   EC2MetadataIp:
     default: ''
     description: The IP address of the EC2 metadata server. (The parameter
@@ -189,6 +193,7 @@ resources:
               - type: ovs_bridge
                 name: br-ex
                 dns_servers: {get_param: DnsServers}
+                domain: {get_param: DnsSearchDomains}
                 use_dhcp: false
                 addresses:
                 - ip_netmask: {get_param: ExternalIpSubnet}

ci/environments/network/multiple-nics/nic-configs/compute-dvr.yaml

@@ -108,6 +108,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
   EC2MetadataIp:
     default: ''
     description: The IP address of the EC2 metadata server. (The parameter
@@ -149,6 +153,7 @@ resources:
               - type: ovs_bridge
                 name: br-ex
                 dns_servers: {get_param: DnsServers}
+                domain: {get_param: DnsSearchDomains}
                 use_dhcp: false
                 routes:
                 - ip_netmask: 0.0.0.0/0

ci/environments/network/multiple-nics/nic-configs/compute.yaml

@@ -108,6 +108,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
   EC2MetadataIp:
     default: ''
     description: The IP address of the EC2 metadata server. (The parameter
@@ -156,6 +160,7 @@ resources:
               - type: ovs_bridge
                 name: br-tenant
                 dns_servers: {get_param: DnsServers}
+                domain: {get_param: DnsSearchDomains}
                 use_dhcp: false
                 addresses:
                 - ip_netmask: {get_param: TenantIpSubnet}

ci/environments/network/multiple-nics/nic-configs/controller.yaml

@@ -156,6 +156,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
   EC2MetadataIp:
     default: ''
     description: The IP address of the EC2 metadata server. (The parameter
@@ -190,6 +194,7 @@ resources:
               - type: ovs_bridge
                 name: br-ex
                 dns_servers: {get_param: DnsServers}
+                domain: {get_param: DnsSearchDomains}
                 use_dhcp: false
                 addresses:
                 - ip_netmask: {get_param: ExternalIpSubnet}

ci/environments/network/public-bond/nic-configs/compute.yaml

@@ -108,6 +108,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
   EC2MetadataIp:
     default: ''
     description: The IP address of the EC2 metadata server. (The parameter
@@ -152,6 +156,7 @@ resources:
               - type: ovs_bridge
                 name: br-tenant
                 dns_servers: {get_param: DnsServers}
+                domain: {get_param: DnsSearchDomains}
                 use_dhcp: false
                 addresses:
                 - ip_netmask: {get_param: TenantIpSubnet}

ci/environments/network/public-bond/nic-configs/controller.yaml

@@ -150,6 +150,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
   EC2MetadataIp:
     default: ''
     description: The IP address of the EC2 metadata server. (The parameter
@@ -180,6 +184,7 @@ resources:
               - type: ovs_bridge
                 name: br-ex
                 dns_servers: {get_param: DnsServers}
+                domain: {get_param: DnsSearchDomains}
                 use_dhcp: false
                 addresses:
                 - ip_netmask: {get_param: ExternalIpSubnet}