diff --git a/ci/environments/network/multiple-nics-ipv6/nic-configs/compute-dvr.yaml b/ci/environments/network/multiple-nics-ipv6/nic-configs/compute-dvr.yaml index de40365752..c3f0d204f4 100644 --- a/ci/environments/network/multiple-nics-ipv6/nic-configs/compute-dvr.yaml +++ b/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} diff --git a/ci/environments/network/multiple-nics-ipv6/nic-configs/compute.yaml b/ci/environments/network/multiple-nics-ipv6/nic-configs/compute.yaml index 849a0958ad..86b0438850 100644 --- a/ci/environments/network/multiple-nics-ipv6/nic-configs/compute.yaml +++ b/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} diff --git a/ci/environments/network/multiple-nics-ipv6/nic-configs/controller.yaml b/ci/environments/network/multiple-nics-ipv6/nic-configs/controller.yaml index 7bda6d7020..32b4ddfb5c 100644 --- a/ci/environments/network/multiple-nics-ipv6/nic-configs/controller.yaml +++ b/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} diff --git a/ci/environments/network/multiple-nics/nic-configs/compute-dvr.yaml b/ci/environments/network/multiple-nics/nic-configs/compute-dvr.yaml index 162ad0c02a..cc56bdfb25 100644 --- a/ci/environments/network/multiple-nics/nic-configs/compute-dvr.yaml +++ b/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 diff --git a/ci/environments/network/multiple-nics/nic-configs/compute.yaml b/ci/environments/network/multiple-nics/nic-configs/compute.yaml index 072219f9fa..70fe635e97 100644 --- a/ci/environments/network/multiple-nics/nic-configs/compute.yaml +++ b/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} diff --git a/ci/environments/network/multiple-nics/nic-configs/controller.yaml b/ci/environments/network/multiple-nics/nic-configs/controller.yaml index 99fa59f8ac..91bc0bdf99 100644 --- a/ci/environments/network/multiple-nics/nic-configs/controller.yaml +++ b/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} diff --git a/ci/environments/network/public-bond/nic-configs/compute.yaml b/ci/environments/network/public-bond/nic-configs/compute.yaml index e22c36d94f..0012d10595 100644 --- a/ci/environments/network/public-bond/nic-configs/compute.yaml +++ b/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} diff --git a/ci/environments/network/public-bond/nic-configs/controller.yaml b/ci/environments/network/public-bond/nic-configs/controller.yaml index e101785bc7..78f5df8e0c 100644 --- a/ci/environments/network/public-bond/nic-configs/controller.yaml +++ b/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} diff --git a/net-config-bond.j2.yaml b/net-config-bond.j2.yaml index 383884635b..71b900f667 100644 --- a/net-config-bond.j2.yaml +++ b/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 diff --git a/net-config-standalone.j2.yaml b/net-config-standalone.j2.yaml index d0b940ea01..5733cafd63 100644 --- a/net-config-standalone.j2.yaml +++ b/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: diff --git a/net-config-static-bridge.j2.yaml b/net-config-static-bridge.j2.yaml index a55cf7ad3b..82261b4d05 100644 --- a/net-config-static-bridge.j2.yaml +++ b/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: diff --git a/net-config-static.j2.yaml b/net-config-static.j2.yaml index 7b18aaa97b..cb874338c8 100644 --- a/net-config-static.j2.yaml +++ b/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: diff --git a/net-config-undercloud.j2.yaml b/net-config-undercloud.j2.yaml index ad5b30c874..761f4bb6cd 100644 --- a/net-config-undercloud.j2.yaml +++ b/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: diff --git a/network/config/2-linux-bonds-vlans/role.role.j2.yaml b/network/config/2-linux-bonds-vlans/role.role.j2.yaml index 167800ffed..77a8d3ccf4 100644 --- a/network/config/2-linux-bonds-vlans/role.role.j2.yaml +++ b/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 diff --git a/network/config/bond-with-vlans/controller-no-external.j2.yaml b/network/config/bond-with-vlans/controller-no-external.j2.yaml index 0d8e51158d..e3486e5c12 100644 --- a/network/config/bond-with-vlans/controller-no-external.j2.yaml +++ b/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: diff --git a/network/config/bond-with-vlans/controller-v6.j2.yaml b/network/config/bond-with-vlans/controller-v6.j2.yaml index a5b029564b..bb757817d2 100644 --- a/network/config/bond-with-vlans/controller-v6.j2.yaml +++ b/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 diff --git a/network/config/bond-with-vlans/role.role.j2.yaml b/network/config/bond-with-vlans/role.role.j2.yaml index 7cedc2c729..9dbcf4dec3 100644 --- a/network/config/bond-with-vlans/role.role.j2.yaml +++ b/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 diff --git a/network/config/multiple-nics/compute-dvr.j2.yaml b/network/config/multiple-nics/compute-dvr.j2.yaml index 07a59dba31..081cf828fa 100644 --- a/network/config/multiple-nics/compute-dvr.j2.yaml +++ b/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: diff --git a/network/config/multiple-nics/controller-v6.j2.yaml b/network/config/multiple-nics/controller-v6.j2.yaml index 7ffd022994..52672a48fd 100644 --- a/network/config/multiple-nics/controller-v6.j2.yaml +++ b/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: diff --git a/network/config/multiple-nics/role.role.j2.yaml b/network/config/multiple-nics/role.role.j2.yaml index 98519a1937..9da8625e29 100644 --- a/network/config/multiple-nics/role.role.j2.yaml +++ b/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: diff --git a/network/config/single-nic-linux-bridge-vlans/controller-v6.j2.yaml b/network/config/single-nic-linux-bridge-vlans/controller-v6.j2.yaml index 867443bc52..04e6fafb63 100644 --- a/network/config/single-nic-linux-bridge-vlans/controller-v6.j2.yaml +++ b/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: diff --git a/network/config/single-nic-linux-bridge-vlans/role.role.j2.yaml b/network/config/single-nic-linux-bridge-vlans/role.role.j2.yaml index 4638798434..f17d0204e2 100644 --- a/network/config/single-nic-linux-bridge-vlans/role.role.j2.yaml +++ b/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: diff --git a/network/config/single-nic-vlans/controller-no-external.j2.yaml b/network/config/single-nic-vlans/controller-no-external.j2.yaml index 03152346d5..6810d757b1 100644 --- a/network/config/single-nic-vlans/controller-no-external.j2.yaml +++ b/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: diff --git a/network/config/single-nic-vlans/controller-v6.j2.yaml b/network/config/single-nic-vlans/controller-v6.j2.yaml index 174ef39167..7ea965c1d2 100644 --- a/network/config/single-nic-vlans/controller-v6.j2.yaml +++ b/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: diff --git a/network/config/single-nic-vlans/role.role.j2.yaml b/network/config/single-nic-vlans/role.role.j2.yaml index 5bd49233bd..9743c92509 100644 --- a/network/config/single-nic-vlans/role.role.j2.yaml +++ b/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: