From: Koki Sanagi <sanagi.koki@jp.fujitsu.com>
Date: Wed, 30 Nov 2016 17:58:19 +0000 (-0500)
Subject: Add networking-fujitsu support to puppet-tripleo
X-Git-Tag: opnfv-6.0.0~446^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=22c78358d0ccc89fb5c05bb36f0b7125da8141f9;p=apex-puppet-tripleo.git

Add networking-fujitsu support to puppet-tripleo

Enable ml2.pp to call networking-fujitsu manifest in puppet-neutron.
The implementation in puppet-neutron is in progress separately.

Change-Id: I5eb2c2a9c50b5991d62f4b6d74b83351c86b02de
Implements: blueprint integration-networking-fujitsu
Depends-On: I37a502b43eb7d91bfe20625248ed117eae3ca535
---

diff --git a/manifests/profile/base/neutron/plugins/ml2.pp b/manifests/profile/base/neutron/plugins/ml2.pp
index 4f4de0b..c046850 100644
--- a/manifests/profile/base/neutron/plugins/ml2.pp
+++ b/manifests/profile/base/neutron/plugins/ml2.pp
@@ -71,5 +71,10 @@ class tripleo::profile::base::neutron::plugins::ml2 (
     if 'ovn' in $mechanism_drivers {
       include ::tripleo::profile::base::neutron::plugins::ml2::ovn
     }
+
+    if 'fujitsu_cfab' in $mechanism_drivers {
+      include ::neutron::plugins::ml2::fujitsu
+      include ::neutron::plugins::ml2::fujitsu::cfab
+    }
   }
 }