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

diff --cc capabilities-map.yaml
Simple merge

diff --cc overcloud-resource-registry-puppet.j2.yaml
index e111a1a,d84f5e5..47dfebb
--- 1/overcloud-resource-registry-puppet.j2.yaml
--- 2/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 d6c03cb,e3870c3..561500c
--- 1/roles_data.yaml
--- 2/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