openstack/tripleo-heat-templates
Code Issues Proposed changes

Add ability to specify dns search domains

Browse Source 
Related-Bug: #1828854
Change-Id: Ie35a159848bbe3f86127ab81a32904a5787eb6bb
Depends-On: I45231fc53c24e1aad3f4a0026696954096430586
(cherry-picked from commit 91c08c1e2b)
This commit is contained in:
Ade Lee
2019-04-12 15:28:44 -04:00
parent b2f89aeca3
commit 9c28228799
22 changed files with 130 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -128,6 +128,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
@@ -173,6 +177,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
View File

@@ -128,6 +128,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
@@ -161,6 +165,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
View File

@@ -128,6 +128,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
@@ -176,6 +180,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
View File

@@ -128,6 +128,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
@@ -162,6 +166,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
View File

@@ -128,6 +128,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
@@ -172,6 +176,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
View File

@@ -128,6 +128,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-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
View File

@@ -34,6 +34,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
@@ -60,6 +64,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-standalone.j2.yaml
View File

@@ -43,6 +43,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.
@@ -92,6 +96,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:

6
net-config-static-bridge.j2.yaml
View File

@@ -39,6 +39,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
@@ -61,6 +65,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
View File

@@ -38,6 +38,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
@@ -60,6 +64,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
View File

@@ -43,6 +43,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.
@@ -87,6 +91,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:

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

@@ -57,6 +57,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
@@ -83,6 +87,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
View File

@@ -55,6 +55,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
@@ -98,6 +102,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
View File

@@ -53,6 +53,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
@@ -110,6 +114,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
View File

@@ -55,6 +55,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
@@ -77,6 +81,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
View File

@@ -54,6 +54,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
@@ -76,6 +80,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
View File

@@ -53,6 +53,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
@@ -81,6 +85,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
View File

@@ -54,6 +54,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
@@ -76,6 +80,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
View File

@@ -53,6 +53,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
@@ -79,6 +83,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
View File

@@ -57,6 +57,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
@@ -79,6 +83,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
View File

@@ -54,6 +54,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
@@ -76,6 +80,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
View File

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