From f1681150bcb3c0967bab31101082dd11e5eefaed Mon Sep 17 00:00:00 2001 From: Janki Chhatbar Date: Tue, 24 Jul 2018 01:08:12 +0530 Subject: [PATCH] Add config option for ODL IPv6 deployment Add a flag to specify which IP version to deploy ODL on via Puppet-ODL. Change-Id: Idd257cf4666b853eb4c52861f9f400b6dbdeeadb Closes-Bug: #1783196 (cherry picked from commit 53b2cc0b56e956a1ade2cab0fae7bce6e5ada868) --- environments/network-isolation-v6.j2.yaml | 2 ++ puppet/services/opendaylight-api.yaml | 1 - puppet/services/opendaylight-ovs.yaml | 5 +++++ .../add-support-for-IPv6-deployment-4c5b577cfb38c416.yaml | 4 ++++ 4 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/add-support-for-IPv6-deployment-4c5b577cfb38c416.yaml diff --git a/environments/network-isolation-v6.j2.yaml b/environments/network-isolation-v6.j2.yaml index 3a585cddd2..1a0a71c29b 100644 --- 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 diff --git a/puppet/services/opendaylight-api.yaml b/puppet/services/opendaylight-api.yaml index 06a06f8484..a9a8ff6d17 100644 --- 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 diff --git a/puppet/services/opendaylight-ovs.yaml b/puppet/services/opendaylight-ovs.yaml index 47dac5e097..f8feb8df72 100644 --- 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 diff --git a/releasenotes/notes/add-support-for-IPv6-deployment-4c5b577cfb38c416.yaml b/releasenotes/notes/add-support-for-IPv6-deployment-4c5b577cfb38c416.yaml new file mode 100644 index 0000000000..0a8ee45865 --- /dev/null +++ b/releasenotes/notes/add-support-for-IPv6-deployment-4c5b577cfb38c416.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Add support for ODL deployment on IPv6 networks. \ No newline at end of file