From fd92a337ba04a166fbdc40e2575dcee84506e692 Mon Sep 17 00:00:00 2001 From: Ade Lee Date: Fri, 12 Apr 2019 15:28:44 -0400 Subject: [PATCH] Add ability to specify dns search domains Related-Bug: #1828854 Change-Id: Ie35a159848bbe3f86127ab81a32904a5787eb6bb Depends-On: I45231fc53c24e1aad3f4a0026696954096430586 (cherry-picked from 91c08c1e2bf0d5cce6a55c1cc27fd510f92e1ae3) --- .../network/multiple-nics-ipv6/nic-configs/compute.yaml | 5 +++++ .../multiple-nics-ipv6/nic-configs/controller.yaml | 5 +++++ .../network/multiple-nics/nic-configs/compute.yaml | 5 +++++ .../network/multiple-nics/nic-configs/controller.yaml | 5 +++++ .../network/public-bond/nic-configs/compute.yaml | 5 +++++ .../network/public-bond/nic-configs/controller.yaml | 5 +++++ net-config-bond.j2.yaml | 8 ++++++++ net-config-static-bridge.j2.yaml | 6 ++++++ net-config-static.j2.yaml | 6 ++++++ net-config-undercloud.j2.yaml | 6 ++++++ .../config/bond-with-vlans/controller-no-external.j2.yaml | 8 ++++++++ network/config/bond-with-vlans/controller-v6.j2.yaml | 6 ++++++ network/config/bond-with-vlans/role.role.j2.yaml | 6 ++++++ network/config/multiple-nics/compute-dvr.j2.yaml | 6 ++++++ network/config/multiple-nics/controller-v6.j2.yaml | 6 ++++++ network/config/multiple-nics/role.role.j2.yaml | 6 ++++++ .../single-nic-linux-bridge-vlans/controller-v6.j2.yaml | 6 ++++++ .../single-nic-linux-bridge-vlans/role.role.j2.yaml | 6 ++++++ .../single-nic-vlans/controller-no-external.j2.yaml | 6 ++++++ network/config/single-nic-vlans/controller-v6.j2.yaml | 6 ++++++ network/config/single-nic-vlans/role.role.j2.yaml | 6 ++++++ 21 files changed, 124 insertions(+) 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 bb1a2c040a..5028317fc8 100644 --- a/ci/environments/network/multiple-nics-ipv6/nic-configs/compute.yaml +++ b/ci/environments/network/multiple-nics-ipv6/nic-configs/compute.yaml @@ -76,6 +76,10 @@ parameters: EC2MetadataIp: # Override this via parameter_defaults description: The IP address of the EC2 metadata server. type: string + 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: @@ -116,6 +120,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 b57b3633f8..769a370348 100644 --- a/ci/environments/network/multiple-nics-ipv6/nic-configs/controller.yaml +++ b/ci/environments/network/multiple-nics-ipv6/nic-configs/controller.yaml @@ -76,6 +76,10 @@ parameters: EC2MetadataIp: # Override this via parameter_defaults description: The IP address of the EC2 metadata server. type: string + 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: @@ -104,6 +108,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.yaml b/ci/environments/network/multiple-nics/nic-configs/compute.yaml index f56033a244..49117b6e64 100644 --- a/ci/environments/network/multiple-nics/nic-configs/compute.yaml +++ b/ci/environments/network/multiple-nics/nic-configs/compute.yaml @@ -76,6 +76,10 @@ parameters: EC2MetadataIp: # Override this via parameter_defaults description: The IP address of the EC2 metadata server. type: string + 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: @@ -119,6 +123,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 d405142736..5b07872c78 100644 --- a/ci/environments/network/multiple-nics/nic-configs/controller.yaml +++ b/ci/environments/network/multiple-nics/nic-configs/controller.yaml @@ -76,6 +76,10 @@ parameters: EC2MetadataIp: # Override this via parameter_defaults description: The IP address of the EC2 metadata server. type: string + 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: @@ -105,6 +109,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 e6ab3cf0f4..8d81ab813b 100644 --- a/ci/environments/network/public-bond/nic-configs/compute.yaml +++ b/ci/environments/network/public-bond/nic-configs/compute.yaml @@ -76,6 +76,10 @@ parameters: EC2MetadataIp: # Override this via parameter_defaults description: The IP address of the EC2 metadata server. type: string + 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: @@ -115,6 +119,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 9727c0ff65..93e106a1da 100644 --- a/ci/environments/network/public-bond/nic-configs/controller.yaml +++ b/ci/environments/network/public-bond/nic-configs/controller.yaml @@ -76,6 +76,10 @@ parameters: EC2MetadataIp: # Override this via parameter_defaults description: The IP address of the EC2 metadata server. type: string + 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: @@ -101,6 +105,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 b0a1e71591..23e477982f 100644 --- a/net-config-bond.j2.yaml +++ b/net-config-bond.j2.yaml @@ -16,6 +16,10 @@ parameters: default: '' description: IP address/subnet on the ctlplane network type: string + 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: '' @@ -37,6 +41,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-static-bridge.j2.yaml b/net-config-static-bridge.j2.yaml index 0ba01788fd..1df05484ec 100644 --- a/net-config-static-bridge.j2.yaml +++ b/net-config-static-bridge.j2.yaml @@ -27,6 +27,10 @@ parameters: EC2MetadataIp: # Override this via parameter_defaults description: The IP address of the EC2 metadata server. type: string + 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: type: OS::Heat::SoftwareConfig @@ -44,6 +48,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 052df338f4..96421eff85 100644 --- a/net-config-static.j2.yaml +++ b/net-config-static.j2.yaml @@ -26,6 +26,10 @@ parameters: EC2MetadataIp: # Override this via parameter_defaults description: The IP address of the EC2 metadata server. type: string + 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: type: OS::Heat::SoftwareConfig @@ -43,6 +47,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 23567e9cda..5a1fbd0184 100644 --- a/net-config-undercloud.j2.yaml +++ b/net-config-undercloud.j2.yaml @@ -21,6 +21,10 @@ parameters: default: [] description: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf. 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: type: OS::Heat::SoftwareConfig @@ -41,6 +45,8 @@ resources: 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-no-external.j2.yaml b/network/config/bond-with-vlans/controller-no-external.j2.yaml index 51525cc198..8f172d18ea 100644 --- a/network/config/bond-with-vlans/controller-no-external.j2.yaml +++ b/network/config/bond-with-vlans/controller-no-external.j2.yaml @@ -55,6 +55,10 @@ parameters: EC2MetadataIp: # Override this via parameter_defaults description: The IP address of the EC2 metadata server. type: string + 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: type: OS::Heat::SoftwareConfig @@ -70,6 +74,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 b64d869887..7d94d86d33 100644 --- a/network/config/bond-with-vlans/controller-v6.j2.yaml +++ b/network/config/bond-with-vlans/controller-v6.j2.yaml @@ -53,6 +53,10 @@ parameters: EC2MetadataIp: # Override this via parameter_defaults description: The IP address of the EC2 metadata server. type: string + 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: type: OS::Heat::SoftwareConfig @@ -85,6 +89,8 @@ resources: name: bridge_name 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 8e7e65a797..da70e83c71 100644 --- a/network/config/bond-with-vlans/role.role.j2.yaml +++ b/network/config/bond-with-vlans/role.role.j2.yaml @@ -51,6 +51,10 @@ parameters: EC2MetadataIp: # Override this via parameter_defaults description: The IP address of the EC2 metadata server. type: string + 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 {%- if role.name == 'ComputeOvsDpdk' %} NumDpdkInterfaceRxQueues: description: Number of Rx Queues required for DPDK bond or DPDK ports @@ -96,6 +100,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 bd28b61242..5b588a0c86 100644 --- a/network/config/multiple-nics/compute-dvr.j2.yaml +++ b/network/config/multiple-nics/compute-dvr.j2.yaml @@ -47,6 +47,10 @@ parameters: EC2MetadataIp: # Override this via parameter_defaults description: The IP address of the EC2 metadata server. type: string + 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: type: OS::Heat::SoftwareConfig @@ -64,6 +68,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 3dac8543a6..55b08f2b53 100644 --- a/network/config/multiple-nics/controller-v6.j2.yaml +++ b/network/config/multiple-nics/controller-v6.j2.yaml @@ -46,6 +46,10 @@ parameters: EC2MetadataIp: # Override this via parameter_defaults description: The IP address of the EC2 metadata server. type: string + 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: type: OS::Heat::SoftwareConfig @@ -63,6 +67,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 fb7eeb2710..b427b2404c 100644 --- a/network/config/multiple-nics/role.role.j2.yaml +++ b/network/config/multiple-nics/role.role.j2.yaml @@ -45,6 +45,10 @@ parameters: EC2MetadataIp: # Override this via parameter_defaults description: The IP address of the EC2 metadata server. type: string + 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 {%- if role.name == 'ComputeOvsDpdk' %} NumDpdkInterfaceRxQueues: description: Number of Rx Queues required for DPDK bond or DPDK ports @@ -68,6 +72,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 99de9daa9b..79ba29b0f8 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 @@ -46,6 +46,10 @@ parameters: EC2MetadataIp: # Override this via parameter_defaults description: The IP address of the EC2 metadata server. type: string + 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: type: OS::Heat::SoftwareConfig @@ -63,6 +67,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 c9d8e79448..8090591f34 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 @@ -45,6 +45,10 @@ parameters: EC2MetadataIp: # Override this via parameter_defaults description: The IP address of the EC2 metadata server. type: string + 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: type: OS::Heat::SoftwareConfig @@ -66,6 +70,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 86842f0b0a..566cbef66e 100644 --- a/network/config/single-nic-vlans/controller-no-external.j2.yaml +++ b/network/config/single-nic-vlans/controller-no-external.j2.yaml @@ -49,6 +49,10 @@ parameters: EC2MetadataIp: # Override this via parameter_defaults description: The IP address of the EC2 metadata server. type: string + 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: type: OS::Heat::SoftwareConfig @@ -66,6 +70,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 15a47d99b2..f077744a26 100644 --- a/network/config/single-nic-vlans/controller-v6.j2.yaml +++ b/network/config/single-nic-vlans/controller-v6.j2.yaml @@ -46,6 +46,10 @@ parameters: EC2MetadataIp: # Override this via parameter_defaults description: The IP address of the EC2 metadata server. type: string + 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: type: OS::Heat::SoftwareConfig @@ -63,6 +67,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 0abc7ba5a7..659448058d 100644 --- a/network/config/single-nic-vlans/role.role.j2.yaml +++ b/network/config/single-nic-vlans/role.role.j2.yaml @@ -45,6 +45,10 @@ parameters: EC2MetadataIp: # Override this via parameter_defaults description: The IP address of the EC2 metadata server. type: string + 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: type: OS::Heat::SoftwareConfig @@ -66,6 +70,8 @@ resources: use_dhcp: false dns_servers: get_param: DnsServers + domain: + get_param: DnsSearchDomains addresses: - ip_netmask: list_join: