Browse Source

Merge "Add DNS related settings" into stable/train

changes/61/716461/1
Zuul 3 months ago
committed by Gerrit Code Review
parent
commit
0b2d0de99d
3 changed files with 25 additions and 0 deletions
  1. +8
    -0
      net-config-bridge.j2.yaml
  2. +9
    -0
      net-config-linux-bridge.j2.yaml
  3. +8
    -0
      net-config-static-bridge-with-external-dhcp.j2.yaml

+ 8
- 0
net-config-bridge.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
{%- for network in networks %}
{{network.name}}IpSubnet:
default: ''
@@ -81,6 +85,10 @@ resources:
- type: ovs_bridge
name: bridge_name
use_dhcp: true
dns_servers:
get_param: DnsServers
domain:
get_param: DnsSearchDomains
members:
- type: interface
name: interface_name


+ 9
- 0
net-config-linux-bridge.j2.yaml View File

@@ -66,6 +66,11 @@ 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


resources:
OsNetConfigImpl:
@@ -84,6 +89,10 @@ resources:
addresses:
- ip_netmask:
get_param: ControlPlaneIp
dns_servers:
get_param: DnsServers
domain:
get_param: DnsSearchDomains
members:
- type: interface
name: interface_name


+ 8
- 0
net-config-static-bridge-with-external-dhcp.j2.yaml View File

@@ -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

resources:
OsNetConfigImpl:
@@ -83,6 +87,10 @@ resources:
- type: ovs_bridge
name: bridge_name
use_dhcp: true
dns_servers:
get_param: DnsServers
domain:
get_param: DnsSearchDomains
members:
- type: interface
name: interface_name


Loading…
Cancel
Save