From: Koki Sanagi <sanagi.koki@jp.fujitsu.com>
Date: Wed, 21 Dec 2016 20:13:56 +0000 (-0500)
Subject: Add fossw of networking-fujitsu support to puppet-tripleo
X-Git-Tag: opnfv-6.0.0~432^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=6f1aa132878ce76607c2db9579d78c47f4f666fe;p=apex-puppet-tripleo.git

Add fossw of networking-fujitsu support to puppet-tripleo

Enable ml2.pp to call networking-fujitsu manifest in puppet-neutron
for fossw ML2 plugin setting.

Change-Id: I044c5812bbc5cd3de4bc33556cffbe5bad8e64cf
Implements: blueprint integration-fossw-networking-fujitsu
Depends-On: I79df6b6a27d95f0c0e2c87207ab80235a4efccfc
---

diff --git a/manifests/profile/base/neutron/plugins/ml2.pp b/manifests/profile/base/neutron/plugins/ml2.pp
index c046850..045716f 100644
--- a/manifests/profile/base/neutron/plugins/ml2.pp
+++ b/manifests/profile/base/neutron/plugins/ml2.pp
@@ -76,5 +76,10 @@ class tripleo::profile::base::neutron::plugins::ml2 (
       include ::neutron::plugins::ml2::fujitsu
       include ::neutron::plugins::ml2::fujitsu::cfab
     }
+
+    if 'fujitsu_fossw' in $mechanism_drivers {
+      include ::neutron::plugins::ml2::fujitsu
+      include ::neutron::plugins::ml2::fujitsu::fossw
+    }
   }
 }