Merge "Add config option for ODL IPv6 deployment"

2018-10-07 23:11:50 +00:00 · 2018-10-07 23:11:50 +00:00 · 6adc2f3f85
parent 474b252358 53b2cc0b56
commit 6adc2f3f85
4 changed files with 11 additions and 1 deletions
--- a/environments/network-isolation-v6.j2.yaml
+++ b/environments/network-isolation-v6.j2.yaml
@ -66,3 +66,5 @@ parameter_defaults:
  ManilaIPv6: True
  # Enable IPv6 environment for Redis.
  RedisIPv6: True
+  # Enable IPv6 environment for OpenDaylight
+  OpenDaylightEnableIPv6Deployment: True
--- a/puppet/services/opendaylight-api.yaml
+++ b/puppet/services/opendaylight-api.yaml
@ -118,7 +118,6 @@ outputs:
            opendaylight::snat_mechanism: {get_param: OpenDaylightSNATMechanism}
            opendaylight::log_mechanism: {get_param: OpenDaylightLogMechanism}
            opendaylight::inherit_dscp_marking: {get_param: OpenDaylightInheritDSCPMarking}
-
          -
            if:
              - internal_tls_enabled
--- a/puppet/services/opendaylight-ovs.yaml
+++ b/puppet/services/opendaylight-ovs.yaml
@ -124,6 +124,10 @@ parameters:
    type: string
    tags:
      - role_specific
+  OpenDaylightEnableIPv6Deployment:
+    description: Enable deployment of ODL over IPv6 underlay network
+    type: boolean
+    default: false

 conditions:

@ -194,6 +198,7 @@ outputs:
               dport: 4789
              '136 neutron gre networks':
               proto: 'gre'
+            enable_ipv6: {get_param: OpenDaylightEnableIPv6Deployment}
          -
            if:
              - internal_tls_enabled
--- a/releasenotes/notes/add-support-for-IPv6-deployment-4c5b577cfb38c416.yaml
+++ b/releasenotes/notes/add-support-for-IPv6-deployment-4c5b577cfb38c416.yaml
@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Add support for ODL deployment on IPv6 networks.