From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 23 Jan 2017 19:27:55 +0000 (+0000)
Subject: Merge "Add THT for fossw ML2 plugin in networking-fujitsu"
X-Git-Tag: opnfv-6.0.0~1191
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=031197253241e98412d4101b033d1f6d675c8073;p=apex-tripleo-heat-templates.git

Merge "Add THT for fossw ML2 plugin in networking-fujitsu"
---

031197253241e98412d4101b033d1f6d675c8073
diff --cc overcloud-resource-registry-puppet.j2.yaml
index e111a1a6,d84f5e51..47dfebb2
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@@ -231,8 -231,8 +231,9 @@@ resource_registry
    OS::TripleO::Services::ContrailWebui: puppet/services/network/contrail-webui.yaml
    OS::TripleO::Services::Zaqar: OS::Heat::None
    OS::TripleO::Services::NeutronML2FujitsuCfab: OS::Heat::None
+   OS::TripleO::Services::NeutronML2FujitsuFossw: OS::Heat::None
    OS::TripleO::Services::CinderHPELeftHandISCSI: OS::Heat::None
 +  OS::TripleO::Services::Etcd: OS::Heat::None
  
  parameter_defaults:
    EnablePackageInstall: false
diff --cc roles_data.yaml
index d6c03cb9,e3870c35..561500c8
--- a/roles_data.yaml
+++ b/roles_data.yaml
@@@ -102,8 -102,8 +102,9 @@@
      - OS::TripleO::Services::Zaqar
      - OS::TripleO::Services::OVNDBs
      - OS::TripleO::Services::NeutronML2FujitsuCfab
+     - OS::TripleO::Services::NeutronML2FujitsuFossw
      - OS::TripleO::Services::CinderHPELeftHandISCSI
 +    - OS::TripleO::Services::Etcd
  
  - name: Compute
    CountDefault: 1