openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove support for Neutron FUJITSU plugin"

Browse Source
This commit is contained in:
Zuul 2020-06-18 10:28:56 +00:00 committed by Gerrit Code Review
commit 9f5bee1bff
19 changed files with 4 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/environments/scenario000-standalone.yaml
View File

@ -124,8 +124,6 @@ resource_registry:
OS::TripleO::Services::NeutronLbaasv2Agent: OS::Heat::None
OS::TripleO::Services::NeutronLbaasv2Api: OS::Heat::None
OS::TripleO::Services::NeutronLinuxbridgeAgent: OS::Heat::None
OS::TripleO::Services::NeutronML2FujitsuCfab: OS::Heat::None
OS::TripleO::Services::NeutronML2FujitsuFossw: OS::Heat::None
OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
OS::TripleO::Services::NeutronNuageVrs: OS::Heat::None
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None

90
deployment/neutron/neutron-plugin-ml2-fujitsu-cfab.yaml
View File

@ -1,90 +0,0 @@
heat_template_version: rocky
description: >
Configure hieradata for Fujitsu C-Fabric plugin configuration
parameters:
ServiceData:
default: {}
description: Dictionary packing service data
type: json
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
RoleName:
default: ''
description: Role name on which the service is applied
type: string
RoleParameters:
default: {}
description: Parameters specific to the role
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:
ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap}
DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}
RoleName: {get_param: RoleName}
RoleParameters: {get_param: RoleParameters}
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
metadata_settings:
get_attr: [NeutronMl2Base, role_data, metadata_settings]

94
deployment/neutron/neutron-plugin-ml2-fujitsu-fossw.yaml
View File

@ -1,94 +0,0 @@
heat_template_version: rocky
description: Configure hieradata for Fujitsu fossw plugin configuration
parameters:
ServiceData:
default: {}
description: Dictionary packing service data
type: json
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
RoleName:
default: ''
description: Role name on which the service is applied
type: string
RoleParameters:
default: {}
description: Parameters specific to the role
type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
NeutronFujitsuFosswIps:
description: 'The List of IP address of all fos switches.'
type: comma_delimited_list
NeutronFujitsuFosswUserName:
description: 'The username of the fos switches.'
type: string
NeutronFujitsuFosswPassword:
description: 'The password of the fos switches.'
type: string
hidden: true
NeutronFujitsuFosswPort:
description: 'The port number used for SSH connection.'
type: number
default: 22
NeutronFujitsuFosswTimeout:
description: 'The timeout os SSH connection.'
type: number
default: 30
NeutronFujitsuFosswUdpDestPort:
description: 'The port number of VXLAN UDP destination on the fos switches.'
type: number
default: 4789
NeutronFujitsuFosswOvsdbVlanidRangeMin:
description: 'The minimum VLAN ID in the range that is used for binding VNI and physical port.'
type: number
default: 2
NeutronFujitsuFosswOvsdbPort:
description: 'The port number which OVSDB server on the fos switches listen.'
type: number
default: 6640
resources:
NeutronMl2Base:
type: ./neutron-plugin-ml2.yaml
properties:
ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap}
DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}
RoleName: {get_param: RoleName}
RoleParameters: {get_param: RoleParameters}
outputs:
role_data:
description: Role data for Fujitsu Fossw ML2 Driver
value:
service_name: neutron_plugin_ml2_fujitsu_fossw
config_settings:
map_merge:
- get_attr: [NeutronMl2Base, role_data, config_settings]
- neutron::plugins::ml2::fujitsu::fossw::fossw_ips: {get_param: NeutronFujitsuFosswIps}
neutron::plugins::ml2::fujitsu::fossw::username: {get_param: NeutronFujitsuFosswUserName}
neutron::plugins::ml2::fujitsu::fossw::password: {get_param: NeutronFujitsuFosswPassword}
neutron::plugins::ml2::fujitsu::fossw::port: {get_param: NeutronFujitsuFosswPort}
neutron::plugins::ml2::fujitsu::fossw::timeout: {get_param: NeutronFujitsuFosswTimeout}
neutron::plugins::ml2::fujitsu::fossw::udp_dest_port: {get_param: NeutronFujitsuFosswUdpDestPort}
neutron::plugins::ml2::fujitsu::fossw::ovsdb_vlanid_range_min: {get_param: NeutronFujitsuFosswOvsdbVlanidRangeMin}
neutron::plugins::ml2::fujitsu::fossw::ovsdb_port: {get_param: NeutronFujitsuFosswOvsdbPort}
step_config: |
include tripleo::profile::base::neutron::plugins::ml2
metadata_settings:
get_attr: [NeutronMl2Base, role_data, metadata_settings]

21
environments/neutron-ml2-fujitsu-cfab.yaml
View File

@ -1,21 +0,0 @@
# A Heat environment file which can be used to enable Fujitsu C-Fabric
# plugin, configured via puppet
resource_registry:
OS::TripleO::Services::NeutronML2FujitsuCfab: ../deployment/neutron/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:

22
environments/neutron-ml2-fujitsu-fossw.yaml
View File

@ -1,22 +0,0 @@
# A Heat environment file which can be used to enable Fujitsu fossw
# plugin, configured via puppet
resource_registry:
OS::TripleO::Services::NeutronML2FujitsuFossw: ../deployment/neutron/neutron-plugin-ml2-fujitsu-fossw.yaml
parameter_defaults:
# Fixed
NeutronMechanismDrivers: ['openvswitch','fujitsu_fossw']
NeutronTypeDrivers: ['vlan','vxlan']
NeutronNetworkType: ['vlan','vxlan']
# Required
NeutronFujitsuFosswIps: '192.168.0.1,192.168.0.2'
NeutronFujitsuFosswUserName:
NeutronFujitsuFosswPassword:
# Optional
#NeutronFujitsuFosswPort:
#NeutronFujitsuFosswTimeout:
#NeutronFujitsuFosswUdpDestPort:
#NeutronFujitsuFosswOvsdbVlanidRangeMin:
#NeutronFujitsuFosswOvsdbPort:

2
environments/undercloud/undercloud-minion.yaml
View File

@ -153,8 +153,6 @@ resource_registry:
OS::TripleO::Services::NeutronLbaasv2Agent: OS::Heat::None
OS::TripleO::Services::NeutronLbaasv2Api: OS::Heat::None
OS::TripleO::Services::NeutronLinuxbridgeAgent: OS::Heat::None
OS::TripleO::Services::NeutronML2FujitsuCfab: OS::Heat::None
OS::TripleO::Services::NeutronML2FujitsuFossw: OS::Heat::None
OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
OS::TripleO::Services::NeutronNuageVrs: OS::Heat::None
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None

2
overcloud-resource-registry-puppet.j2.yaml
View File

@ -270,8 +270,6 @@ resource_registry:
OS::TripleO::Services::OpenStackClients: OS::Heat::None
OS::TripleO::Services::TLSProxyBase: OS::Heat::None
OS::TripleO::Services::Zaqar: OS::Heat::None
OS::TripleO::Services::NeutronML2FujitsuCfab: OS::Heat::None
OS::TripleO::Services::NeutronML2FujitsuFossw: OS::Heat::None
OS::TripleO::Services::CinderBackendDellSc: OS::Heat::None
OS::TripleO::Services::CinderBackendDellEMCSc: OS::Heat::None
OS::TripleO::Services::CinderBackendDellEMCPowermax: OS::Heat::None

4
releasenotes/notes/remove-neutron-fujitsu-plugins-6414a5d6962e3260.yaml Normal file
View File

@ -0,0 +1,4 @@
---
deprecations:
- |
Support for Neutron FUJITSU plugin has been removed.

2
roles/Controller.yaml
View File

@ -135,8 +135,6 @@
- OS::TripleO::Services::NeutronL3Agent
- OS::TripleO::Services::NeutronLinuxbridgeAgent
- OS::TripleO::Services::NeutronMetadataAgent
- OS::TripleO::Services::NeutronML2FujitsuCfab
- OS::TripleO::Services::NeutronML2FujitsuFossw
- OS::TripleO::Services::NeutronOvsAgent
- OS::TripleO::Services::NeutronVppAgent
- OS::TripleO::Services::NeutronAgentsIBConfig

2
roles/ControllerNoCeph.yaml
View File

@ -127,8 +127,6 @@
- OS::TripleO::Services::NeutronL3Agent
- OS::TripleO::Services::NeutronLinuxbridgeAgent
- OS::TripleO::Services::NeutronMetadataAgent
- OS::TripleO::Services::NeutronML2FujitsuCfab
- OS::TripleO::Services::NeutronML2FujitsuFossw
- OS::TripleO::Services::NeutronOvsAgent
- OS::TripleO::Services::NeutronVppAgent
- OS::TripleO::Services::NeutronAgentsIBConfig

2
roles/ControllerNovaStandalone.yaml
View File

@ -111,8 +111,6 @@
- OS::TripleO::Services::NeutronL3Agent
- OS::TripleO::Services::NeutronLinuxbridgeAgent
- OS::TripleO::Services::NeutronMetadataAgent
- OS::TripleO::Services::NeutronML2FujitsuCfab
- OS::TripleO::Services::NeutronML2FujitsuFossw
- OS::TripleO::Services::NeutronOvsAgent
- OS::TripleO::Services::NeutronVppAgent
- OS::TripleO::Services::NovaIronic

2
roles/ControllerSriov.yaml
View File

@ -133,8 +133,6 @@
- OS::TripleO::Services::NeutronL3Agent
- OS::TripleO::Services::NeutronLinuxbridgeAgent
- OS::TripleO::Services::NeutronMetadataAgent
- OS::TripleO::Services::NeutronML2FujitsuCfab
- OS::TripleO::Services::NeutronML2FujitsuFossw
- OS::TripleO::Services::NeutronOvsAgent
- OS::TripleO::Services::NeutronVppAgent
- OS::TripleO::Services::NeutronAgentsIBConfig

2
roles/ControllerStorageDashboard.yaml
View File

@ -136,8 +136,6 @@
- OS::TripleO::Services::NeutronL3Agent
- OS::TripleO::Services::NeutronLinuxbridgeAgent
- OS::TripleO::Services::NeutronMetadataAgent
- OS::TripleO::Services::NeutronML2FujitsuCfab
- OS::TripleO::Services::NeutronML2FujitsuFossw
- OS::TripleO::Services::NeutronOvsAgent
- OS::TripleO::Services::NeutronVppAgent
- OS::TripleO::Services::NeutronAgentsIBConfig

2
roles/ControllerStorageNfs.yaml
View File

@ -137,8 +137,6 @@
- OS::TripleO::Services::NeutronL3Agent
- OS::TripleO::Services::NeutronLinuxbridgeAgent
- OS::TripleO::Services::NeutronMetadataAgent
- OS::TripleO::Services::NeutronML2FujitsuCfab
- OS::TripleO::Services::NeutronML2FujitsuFossw
- OS::TripleO::Services::NeutronOvsAgent
- OS::TripleO::Services::NeutronVppAgent
- OS::TripleO::Services::NeutronAgentsIBConfig

2
roles/Networker.yaml
View File

@ -31,8 +31,6 @@
- OS::TripleO::Services::NeutronL2gwAgent
- OS::TripleO::Services::NeutronL3Agent
- OS::TripleO::Services::NeutronMetadataAgent
- OS::TripleO::Services::NeutronML2FujitsuCfab
- OS::TripleO::Services::NeutronML2FujitsuFossw
- OS::TripleO::Services::NeutronOvsAgent
- OS::TripleO::Services::NeutronVppAgent
- OS::TripleO::Services::ContainersLogrotateCrond

2
roles/NetworkerSriov.yaml
View File

@ -32,8 +32,6 @@
- OS::TripleO::Services::NeutronL2gwAgent
- OS::TripleO::Services::NeutronL3Agent
- OS::TripleO::Services::NeutronMetadataAgent
- OS::TripleO::Services::NeutronML2FujitsuCfab
- OS::TripleO::Services::NeutronML2FujitsuFossw
- OS::TripleO::Services::NeutronOvsAgent
- OS::TripleO::Services::NeutronVppAgent
- OS::TripleO::Services::ContainersLogrotateCrond

2
roles/Standalone.yaml
View File

@ -130,8 +130,6 @@
- OS::TripleO::Services::NeutronL2gwApi
- OS::TripleO::Services::NeutronL3Agent
- OS::TripleO::Services::NeutronLinuxbridgeAgent
- OS::TripleO::Services::NeutronML2FujitsuCfab
- OS::TripleO::Services::NeutronML2FujitsuFossw
- OS::TripleO::Services::NeutronMetadataAgent
- OS::TripleO::Services::NeutronOvsAgent
- OS::TripleO::Services::NeutronSfcApi

2
roles_data.yaml
View File

@ -138,8 +138,6 @@
- OS::TripleO::Services::NeutronL3Agent
- OS::TripleO::Services::NeutronLinuxbridgeAgent
- OS::TripleO::Services::NeutronMetadataAgent
- OS::TripleO::Services::NeutronML2FujitsuCfab
- OS::TripleO::Services::NeutronML2FujitsuFossw
- OS::TripleO::Services::NeutronOvsAgent
- OS::TripleO::Services::NeutronVppAgent
- OS::TripleO::Services::NeutronAgentsIBConfig

2
sample-env-generator/undercloud-minion.yaml
View File

@ -174,8 +174,6 @@ environments:
OS::TripleO::Services::NeutronLbaasv2Api: OS::Heat::None
OS::TripleO::Services::NeutronLinuxbridgeAgent: OS::Heat::None
OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
OS::TripleO::Services::NeutronML2FujitsuCfab: OS::Heat::None
OS::TripleO::Services::NeutronML2FujitsuFossw: OS::Heat::None
OS::TripleO::Services::NeutronNuageVrs: OS::Heat::None
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::NeutronSfcApi: OS::Heat::None