openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Add config option for ODL IPv6 deployment"

Browse Source
This commit is contained in:
Zuul 2018-10-07 23:11:50 +00:00 committed by Gerrit Code Review
commit 6adc2f3f85
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
environments/network-isolation-v6.j2.yaml
View File

@ -66,3 +66,5 @@ parameter_defaults:
ManilaIPv6: True ManilaIPv6: True
# Enable IPv6 environment for Redis. # Enable IPv6 environment for Redis.
RedisIPv6: True RedisIPv6: True
# Enable IPv6 environment for OpenDaylight
OpenDaylightEnableIPv6Deployment: True

1
puppet/services/opendaylight-api.yaml
View File

@ -118,7 +118,6 @@ outputs:
opendaylight::snat_mechanism: {get_param: OpenDaylightSNATMechanism} opendaylight::snat_mechanism: {get_param: OpenDaylightSNATMechanism}
opendaylight::log_mechanism: {get_param: OpenDaylightLogMechanism} opendaylight::log_mechanism: {get_param: OpenDaylightLogMechanism}
opendaylight::inherit_dscp_marking: {get_param: OpenDaylightInheritDSCPMarking} opendaylight::inherit_dscp_marking: {get_param: OpenDaylightInheritDSCPMarking}
- -
if: if:
- internal_tls_enabled - internal_tls_enabled

5
puppet/services/opendaylight-ovs.yaml
View File

@ -124,6 +124,10 @@ parameters:
type: string type: string
tags: tags:
- role_specific - role_specific
OpenDaylightEnableIPv6Deployment:
description: Enable deployment of ODL over IPv6 underlay network
type: boolean
default: false
conditions: conditions:
@ -194,6 +198,7 @@ outputs:
dport: 4789 dport: 4789
'136 neutron gre networks': '136 neutron gre networks':
proto: 'gre' proto: 'gre'
enable_ipv6: {get_param: OpenDaylightEnableIPv6Deployment}
- -
if: if:
- internal_tls_enabled - internal_tls_enabled

4
releasenotes/notes/add-support-for-IPv6-deployment-4c5b577cfb38c416.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- |
Add support for ODL deployment on IPv6 networks.