openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Use parameter for ipv6 address mode"

Browse Source
This commit is contained in:
Zuul 2019-10-12 04:41:24 +00:00 committed by Gerrit Code Review
commit ea15541eea
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extraconfig/post_deploy/undercloud_ctlplane_network.py
View File

@ -88,8 +88,8 @@ def _neutron_subnet_create(sdk, network_id, cidr, gateway, host_routes,
gateway_ip=gateway,
enable_dhcp=True,
ip_version='6',
ipv6_address_mode='dhcpv6-stateless',
ipv6_ra_mode='dhcpv6-stateless',
ipv6_address_mode=CONF['ipv6_address_mode'],
ipv6_ra_mode=CONF['ipv6_address_mode'],
allocation_pools=allocation_pools,
network_id=network_id,
segment_id=segment_id,

8
extraconfig/post_deploy/undercloud_post.yaml
View File

@ -71,6 +71,13 @@ parameters:
type: number
constraints:
- range: { min: 1000, max: 65536 }
UndercloudCtlplaneIPv6AddressMode:
default: dhcpv6-stateless
description: >
IPv6 address configuration mode for the undercloud provisioning network.
type: string
constraints:
- allowed_values: ['dhcpv6-stateless', 'dhcpv6-stateful']
KeystoneRegion:
type: string
default: 'regionOne'
@ -229,3 +236,4 @@ resources:
enable_routed_networks: {get_param: UndercloudEnableRoutedNetworks}
mtu: {get_param: UndercloudLocalMtu}
home_dir: {get_param: UndercloudHomeDir}
ipv6_address_mode: {get_param: UndercloudCtlplaneIPv6AddressMode}