From: Itzik Brown <itzikb@redhat.com>
Date: Thu, 29 Dec 2016 15:35:41 +0000 (+0200)
Subject: Add the ml2_odl section when using opendalight_v2
X-Git-Tag: opnfv-6.0.0~430^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=c412f5071de46dc231146b6d823d9f43f1035c10;p=apex-puppet-tripleo.git

Add the ml2_odl section when using opendalight_v2

Add the option to add the section of ml2_odl
to ml2_conf.ini when opendaylight_v2 mechanism driver is used

Change-Id: I2a1c5097614e47cc09e43bbc77305a0548d54baa
---

diff --git a/manifests/profile/base/neutron/plugins/ml2.pp b/manifests/profile/base/neutron/plugins/ml2.pp
index c046850..d30eea1 100644
--- a/manifests/profile/base/neutron/plugins/ml2.pp
+++ b/manifests/profile/base/neutron/plugins/ml2.pp
@@ -64,7 +64,7 @@ class tripleo::profile::base::neutron::plugins::ml2 (
       include ::neutron::plugins::ml2::bigswitch::restproxy
     }
 
-    if 'opendaylight' in $mechanism_drivers {
+    if ('opendaylight' in $mechanism_drivers) or ('opendaylight_v2' in $mechanism_drivers) {
       include ::tripleo::profile::base::neutron::plugins::ml2::opendaylight
     }