Browse Source

Add ability to specify dns search domains

Related-Bug: #1828854
Change-Id: Ie35a159848bbe3f86127ab81a32904a5787eb6bb
Depends-On: I45231fc53c24e1aad3f4a0026696954096430586
(cherry-picked from 91c08c1e2b)
changes/49/658849/3
Ade Lee 3 years ago
parent
commit
fd92a337ba
  1. 5
      ci/environments/network/multiple-nics-ipv6/nic-configs/compute.yaml
  2. 5
      ci/environments/network/multiple-nics-ipv6/nic-configs/controller.yaml
  3. 5
      ci/environments/network/multiple-nics/nic-configs/compute.yaml
  4. 5
      ci/environments/network/multiple-nics/nic-configs/controller.yaml
  5. 5
      ci/environments/network/public-bond/nic-configs/compute.yaml
  6. 5
      ci/environments/network/public-bond/nic-configs/controller.yaml
  7. 8
      net-config-bond.j2.yaml
  8. 6
      net-config-static-bridge.j2.yaml
  9. 6
      net-config-static.j2.yaml
  10. 6
      net-config-undercloud.j2.yaml
  11. 8
      network/config/bond-with-vlans/controller-no-external.j2.yaml
  12. 6
      network/config/bond-with-vlans/controller-v6.j2.yaml
  13. 6
      network/config/bond-with-vlans/role.role.j2.yaml
  14. 6
      network/config/multiple-nics/compute-dvr.j2.yaml
  15. 6
      network/config/multiple-nics/controller-v6.j2.yaml
  16. 6
      network/config/multiple-nics/role.role.j2.yaml
  17. 6
      network/config/single-nic-linux-bridge-vlans/controller-v6.j2.yaml
  18. 6
      network/config/single-nic-linux-bridge-vlans/role.role.j2.yaml
  19. 6
      network/config/single-nic-vlans/controller-no-external.j2.yaml
  20. 6
      network/config/single-nic-vlans/controller-v6.j2.yaml
  21. 6
      network/config/single-nic-vlans/role.role.j2.yaml

5
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}

5
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}

5
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}

5
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}

5
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}

5
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}

8
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

6
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:

6
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:

6
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:

8
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:

6
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

6
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

6
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:

6
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:

6
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:

6
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:

6
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:

6
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:

6
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:

6
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:

Loading…
Cancel
Save