Merge "Add THT for networking-fujitsu"

capabilities-map.yaml

@@ -355,6 +355,11 @@ topics:
             description: Enables PLUMgrid extensions
             requires:
               - overcloud-resource-registry-puppet.yaml
+          - file: environments/neutron-ml2-fujitsu-cfab.yaml
+            title: Fujitsu Neutron plugin for C-Fabric
+            description: Enable C-Fabric in the overcloud
+            requires:
+              - overcloud-resource-registry-puppet.yaml
 
   - title: Nova Extensions
     description:

environments/neutron-ml2-fujitsu-cfab.yaml

@@ -0,0 +1,21 @@
+# A Heat environment file which can be used to enable Fujitsu C-Fabric
+# plugin, configured via puppet
+resource_registry:
+  OS::TripleO::Services::NeutronML2FujitsuCfab: ../puppet/services/neutron-plugin-ml2-fujitsu-cfab.yaml
+
+parameter_defaults:
+  # Fixed
+  NeutronMechanismDrivers: ['openvswitch','fujitsu_cfab']
+  NeutronTypeDrivers: 'vlan'
+  NeutronNetworkType: 'vlan'
+
+  # Required
+  NeutronFujitsuCfabAddress: '192.168.0.1'
+  NeutronFujitsuCfabUserName: 'admin'
+  NeutronFujitsuCfabPassword:
+
+  # Optional
+  #NeutronFujitsuCfabPhysicalNetworks:
+  #NeutronFujitsuCfabSharePprofile:
+  #NeutronFujitsuCfabPprofilePrefix:
+  #NeutronFujitsuCfabSaveConfig:

overcloud-resource-registry-puppet.j2.yaml

@@ -230,6 +230,7 @@ resource_registry:
   OS::TripleO::Services::ContrailDatabase: puppet/services/network/contrail-database.yaml
   OS::TripleO::Services::ContrailWebui: puppet/services/network/contrail-webui.yaml
   OS::TripleO::Services::Zaqar: OS::Heat::None
+  OS::TripleO::Services::NeutronML2FujitsuCfab: OS::Heat::None
 
 parameter_defaults:
   EnablePackageInstall: false

puppet/services/neutron-plugin-ml2-fujitsu-cfab.yaml

@@ -0,0 +1,73 @@
+heat_template_version: 2017-02-24
+
+description: >
+  Configure hieradata for Fujitsu C-Fabric plugin configuration
+
+parameters:
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+  NeutronFujitsuCfabAddress:
+    description: 'The address of the C-Fabric to telnet to.'
+    type: string
+  NeutronFujitsuCfabUserName:
+    description: 'The C-Fabric username to use.'
+    type: string
+  NeutronFujitsuCfabPassword:
+    description: 'The C-Fabric password to use.'
+    type: string
+    hidden: true
+  NeutronFujitsuCfabPhysicalNetworks:
+    description: 'List of <physical_network>:<vfab_id> tuples specifying physical_network names and corresponding vfab ids.'
+    type: comma_delimited_list
+    default: ''
+  NeutronFujitsuCfabSharePprofile:
+    description: '"Whether to share a C-Fabric pprofile among Neutron ports using the same VLAN ID.'
+    type: boolean
+    default: false
+  NeutronFujitsuCfabPprofilePrefix:
+    description: 'The prefix string for pprofile name.'
+    type: string
+    default: ''
+  NeutronFujitsuCfabSaveConfig:
+    description: 'Whether to save configuration.'
+    type: boolean
+    default: true
+
+resources:
+
+  NeutronMl2Base:
+    type: ./neutron-plugin-ml2.yaml
+    properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
+      EndpointMap: {get_param: EndpointMap}
+
+outputs:
+  role_data:
+    description: Role data for Fujitsu Cfab ML2 Driver
+    value:
+      service_name: neutron_plugin_ml2_fujitsu_cfab
+      config_settings:
+        map_merge:
+          - get_attr: [NeutronMl2Base, role_data, config_settings]
+          - neutron::plugins::ml2::fujitsu::cfab::address: {get_param: NeutronFujitsuCfabAddress}
+            neutron::plugins::ml2::fujitsu::cfab::username: {get_param: NeutronFujitsuCfabUserName}
+            neutron::plugins::ml2::fujitsu::cfab::password: {get_param: NeutronFujitsuCfabPassword}
+            neutron::plugins::ml2::fujitsu::cfab::physical_networks: {get_param: NeutronFujitsuCfabPhysicalNetworks}
+            neutron::plugins::ml2::fujitsu::cfab::share_pprofile: {get_param: NeutronFujitsuCfabSharePprofile}
+            neutron::plugins::ml2::fujitsu::cfab::pprofile_prefix: {get_param: NeutronFujitsuCfabPprofilePrefix}
+            neutron::plugins::ml2::fujitsu::cfab::save_config: {get_param: NeutronFujitsuCfabSaveConfig}
+      step_config: |
+        include ::tripleo::profile::base::neutron::plugins::ml2

roles_data.yaml

@@ -101,6 +101,7 @@
     - OS::TripleO::Services::PankoApi
     - OS::TripleO::Services::Zaqar
     - OS::TripleO::Services::OVNDBs
+    - OS::TripleO::Services::NeutronML2FujitsuCfab
 
 - name: Compute
   CountDefault: 1