openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Use per-subnet DNS nameservers for ctlplane 

Use the DNS nameservers for each ctlplane subnet,
instead of using the same DNSServers for all subnets.

Related-Bug: #1834306
Depends-On: I0dc03eddf9ea00ff33cd3ae0cdc8f42a4961e89c
Change-Id: I4c102d8f728a90cf9eb90f6129738377a8d2503c
This commit is contained in:
Harald Jensås 2019-06-25 15:26:07 +02:00
parent 96a527e40d
commit dae0a89a80
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extraconfig/post_deploy/undercloud_ctlplane_network.py
View File

@ -216,7 +216,7 @@ def _local_neutron_segments_and_subnets(sdk, ctlplane_id, net_cidrs):
_neutron_add_subnet_segment_association(sdk, subnet.id, segment.id)
_neutron_subnet_update(
sdk, subnet.id, s['NetworkCidr'], s['NetworkGateway'], host_routes,
s.get('AllocationPools'), name, CONF['nameservers'])
s.get('AllocationPools'), name, s['DnsNameServers'])
else:
if CONF['enable_routed_networks']:
segment_id = segment.id
@ -225,7 +225,7 @@ def _local_neutron_segments_and_subnets(sdk, ctlplane_id, net_cidrs):
subnet = _neutron_subnet_create(
sdk, ctlplane_id, s['NetworkCidr'], s['NetworkGateway'],
host_routes, s.get('AllocationPools'), name, segment_id,
CONF['nameservers'])
s['DnsNameServers'])
# If the subnet is IPv6 we need to start a router so that router
# advertisments are sent out for stateless IP addressing to work.
if netaddr.IPNetwork(s['NetworkCidr']).version == 6:
@ -254,7 +254,7 @@ def _remote_neutron_segments_and_subnets(sdk, ctlplane_id, net_cidrs):
_neutron_subnet_update(
sdk, subnet.id, s['NetworkCidr'], s['NetworkGateway'],
host_routes, s.get('AllocationPools'), name,
CONF['nameservers'])
s['DnsNameServers'])
else:
if segment:
_neutron_segment_update(sdk, segment.id, name)
@ -264,7 +264,7 @@ def _remote_neutron_segments_and_subnets(sdk, ctlplane_id, net_cidrs):
subnet = _neutron_subnet_create(
sdk, ctlplane_id, s['NetworkCidr'], s['NetworkGateway'],
host_routes, s.get('AllocationPools'), name, segment.id,
CONF['nameservers'])
s['DnsNameServers'])
# If the subnet is IPv6 we need to start a router so that router
# advertisments are sent out for stateless IP addressing to work.
if netaddr.IPNetwork(s['NetworkCidr']).version == 6:

1
extraconfig/post_deploy/undercloud_post.yaml
View File

@ -223,7 +223,6 @@ resources:
cloud_name: {get_param: UndercloudCloudName}
local_ip: {get_param: [DeployedServerPortMap, 'control_virtual_ip', fixed_ips, 0, ip_address]}
local_subnet: {get_param: UndercloudCtlplaneLocalSubnet}
nameservers: {get_param: DnsServers}
physical_network: {get_param: CtlplaneLocalPhysicalNetwork}
subnets: {get_param: UndercloudCtlplaneSubnets}
enable_routed_networks: {get_param: UndercloudEnableRoutedNetworks}