Merge "Add ability to specify dns search domains" into stable/stein

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}

net-config-bond.j2.yaml

@@ -48,6 +48,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: # Here for compatability, not used.
     default: ''
     description: The IP address of the EC2 metadata server. (The parameter
@@ -88,6 +92,10 @@ resources:
               - type: ovs_bridge
                 name: bridge_name
                 use_dhcp: true
+                dns_servers:
+                  get_param: DnsServers
+                domain:
+                  get_param: DnsSearchDomains
                 members:
                 - type: ovs_bond
                   name: bond1

net-config-standalone.j2.yaml

@@ -63,6 +63,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
   InterfaceLocalMtu: # Override this via parameter_defaults
     default: 1500
     description: MTU to use for the local_interface.
@@ -112,6 +116,8 @@ resources:
                   use_dhcp: false
                   dns_servers:
                     get_param: DnsServers
+                  domain:
+                    get_param: DnsSearchDomains
                   ovs_extra:
                     - "br-set-external-id br-ctlplane bridge-id br-ctlplane"
                   addresses:

net-config-static-bridge.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
   EC2MetadataIp:
     default: ''
     description: The IP address of the EC2 metadata server. (The parameter
@@ -89,6 +93,8 @@ resources:
                 use_dhcp: false
                 dns_servers:
                   get_param: DnsServers
+                domain:
+                  get_param: DnsSearchDomains
                 addresses:
                 - ip_netmask:
                     list_join:

net-config-static.j2.yaml

@@ -66,6 +66,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
@@ -88,6 +92,8 @@ resources:
                 use_dhcp: false
                 dns_servers:
                   get_param: DnsServers
+                domain:
+                  get_param: DnsSearchDomains
                 addresses:
                 - ip_netmask:
                     list_join:

net-config-undercloud.j2.yaml

@@ -63,6 +63,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
   UndercloudLocalMtu: # Override this via parameter_defaults
     default: 1500
     description: MTU to use for the Undercloud local_interface.
@@ -107,6 +111,8 @@ resources:
                   use_dhcp: false
                   dns_servers:
                     get_param: DnsServers
+                  domain:
+                    get_param: DnsSearchDomains
                   ovs_extra:
                     - "br-set-external-id br-ctlplane bridge-id br-ctlplane"
                   addresses:

network/config/2-linux-bonds-vlans/role.role.j2.yaml

@@ -82,6 +82,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
@@ -179,6 +183,8 @@ resources:
                   get_param: BondInterfaceOvsOptions
                 dns_servers:
                   get_param: DnsServers
+                domain:
+                  get_param: DnsSearchDomains
                 members:
                   - type: interface
                     name: nic2

network/config/bond-with-vlans/controller-no-external.j2.yaml

@@ -70,6 +70,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
@@ -96,6 +100,10 @@ resources:
               - type: interface
                 name: nic1
                 use_dhcp: false
+                dns_servers:
+                  get_param: DnsServers
+                domain:
+                  get_param: DnsSearchDomains
                 addresses:
                 - ip_netmask:
                     list_join:

network/config/bond-with-vlans/controller-v6.j2.yaml

@@ -68,6 +68,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
@@ -135,6 +139,8 @@ resources:
                   get_attr: [MinViableMtu, value]
                 dns_servers:
                   get_param: DnsServers
+                domain:
+                  get_param: DnsSearchDomains
                 members:
                 - type: ovs_bond
                   name: bond1

network/config/bond-with-vlans/role.role.j2.yaml

@@ -79,6 +79,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
@@ -157,6 +161,8 @@ resources:
 {%-     endif %}
                 dns_servers:
                   get_param: DnsServers
+                domain:
+                  get_param: DnsSearchDomains
                 members:
                 - type: ovs_bond
                   name: bond1

network/config/multiple-nics/compute-dvr.j2.yaml

@@ -72,6 +72,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
@@ -96,6 +100,8 @@ resources:
                 use_dhcp: false
                 dns_servers:
                   get_param: DnsServers
+                domain:
+                  get_param: DnsSearchDomains
                 addresses:
                 - ip_netmask:
                     list_join:

network/config/multiple-nics/controller-v6.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
   EC2MetadataIp:
     default: ''
     description: The IP address of the EC2 metadata server. (The parameter
@@ -91,6 +95,8 @@ resources:
                 use_dhcp: false
                 dns_servers:
                   get_param: DnsServers
+                domain:
+                  get_param: DnsSearchDomains
                 addresses:
                 - ip_netmask:
                     list_join:

network/config/multiple-nics/role.role.j2.yaml

@@ -81,6 +81,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
@@ -111,6 +115,8 @@ resources:
                 use_dhcp: false
                 dns_servers:
                   get_param: DnsServers
+                domain:
+                  get_param: DnsSearchDomains
                 addresses:
                 - ip_netmask:
                     list_join:

network/config/single-nic-linux-bridge-vlans/controller-v6.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
   EC2MetadataIp:
     default: ''
     description: The IP address of the EC2 metadata server. (The parameter
@@ -109,6 +113,8 @@ resources:
                 use_dhcp: false
                 dns_servers:
                   get_param: DnsServers
+                domain:
+                  get_param: DnsSearchDomains
                 addresses:
                 - ip_netmask:
                     list_join:

network/config/single-nic-linux-bridge-vlans/role.role.j2.yaml

@@ -79,6 +79,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
@@ -125,6 +129,8 @@ resources:
                 use_dhcp: false
                 dns_servers:
                   get_param: DnsServers
+                domain:
+                  get_param: DnsSearchDomains
                 addresses:
                 - ip_netmask:
                     list_join:

network/config/single-nic-vlans/controller-no-external.j2.yaml

@@ -70,6 +70,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
@@ -92,6 +96,8 @@ resources:
                 use_dhcp: false
                 dns_servers:
                   get_param: DnsServers
+                domain:
+                  get_param: DnsSearchDomains
                 addresses:
                 - ip_netmask:
                     list_join:

network/config/single-nic-vlans/controller-v6.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
   EC2MetadataIp:
     default: ''
     description: The IP address of the EC2 metadata server. (The parameter
@@ -109,6 +113,8 @@ resources:
                 use_dhcp: false
                 dns_servers:
                   get_param: DnsServers
+                domain:
+                  get_param: DnsSearchDomains
                 addresses:
                 - ip_netmask:
                     list_join:

network/config/single-nic-vlans/role.role.j2.yaml

@@ -79,6 +79,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
@@ -125,6 +129,8 @@ resources:
                 use_dhcp: false
                 dns_servers:
                   get_param: DnsServers
+                domain:
+                  get_param: DnsSearchDomains
                 addresses:
                 - ip_netmask:
                     list_join: