openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove implementation for Nuage integration"

This commit is contained in:
Zuul 2022-06-07 01:36:09 +00:00 committed by Gerrit Code Review
parent ba521cf1da eae3c2543d
commit e30c94f760
9 changed files with 0 additions and 349 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,6 @@ resource_registry:
OS::TripleO::Services::ComputeCeilometerAgent: OS::Heat::None
OS::TripleO::Services::ComputeInstanceHA: OS::Heat::None
OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
OS::TripleO::Services::ComputeNeutronCorePluginNuage: OS::Heat::None
OS::TripleO::Services::ComputeNeutronL3Agent: OS::Heat::None
OS::TripleO::Services::ComputeNeutronMetadataAgent: OS::Heat::None
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
@ -105,7 +104,6 @@ resource_registry:
OS::TripleO::Services::NeutronBgpVpnBagpipe: OS::Heat::None
OS::TripleO::Services::NeutronCorePlugin: OS::Heat::None
OS::TripleO::Services::NeutronCorePluginML2Ansible: OS::Heat::None
OS::TripleO::Services::NeutronCorePluginML2Nuage: OS::Heat::None
OS::TripleO::Services::NeutronCorePluginML2OVN: OS::Heat::None
OS::TripleO::Services::NeutronCorePluginMLNXSDN: OS::Heat::None
OS::TripleO::Services::NeutronCorePluginNSX: OS::Heat::None
@ -118,7 +116,6 @@ resource_registry:
OS::TripleO::Services::NeutronLbaasv2Api: OS::Heat::None
OS::TripleO::Services::NeutronLinuxbridgeAgent: OS::Heat::None
OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
OS::TripleO::Services::NeutronNuageVrs: OS::Heat::None
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::NeutronSfcApi: OS::Heat::None
OS::TripleO::Services::NeutronSriovAgent: OS::Heat::None

103
deployment/neutron/neutron-compute-plugin-nuage.yaml
View File

@ -1,103 +0,0 @@
heat_template_version: wallaby
description: >
OpenStack Neutron Compute Nuage plugin
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. Use
parameter_merge_strategies to merge it with the defaults.
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
NovaPassword:
description: The password for the nova service and db account
type: string
hidden: true
NuageMetadataPort:
description: TCP Port to listen for metadata server requests
type: string
default: '9697'
NuageActiveController:
description: IP address of the Active Virtualized Services Controller (VSC)
type: string
NuageStandbyController:
description: IP address of the Standby Virtualized Services Controller (VSC)
type: string
NuageNovaMetadataPort:
description: TCP Port used by Nova metadata server
type: string
default: '8775'
NuageMetadataProxySharedSecret:
description: Shared secret to sign the instance-id request
type: string
NuageNovaClientVersion:
description: Client Version Nova
type: string
default: '2'
NuageNovaOsUsername:
description: Nova username in keystone_authtoken
type: string
default: 'nova'
NuageMetadataAgentStartWithOvs:
description: Set to true if nuage-metadata-agent needs to be started with nuage-openvswitch-switch
type: boolean
default: true
NuageNovaApiEndpoint:
description: One of publicURL, internalURL, adminURL in "keystone endpoint-list"
type: string
default: 'publicURL'
NuageNovaRegionName:
description: Region name in "keystone endpoint-list"
type: string
default: 'regionOne'
NuageBridgeMTU:
description: Support for non-default MTU configured on each VRS node
type: string
default: ''
outputs:
role_data:
description: Role data for the Neutron Compute Nuage plugin
firewall_rules:
'118 neutron vxlan networks':
proto: 'udp'
dport: 4789
'100 metadata agent':
dport: {get_param: NuageMetadataPort}
value:
service_name: neutron_compute_plugin_nuage
config_settings:
nuage::vrs::active_controller: {get_param: NuageActiveController}
nuage::vrs::standby_controller: {get_param: NuageStandbyController}
nuage::vrs::bridge_mtu: {get_param: NuageBridgeMTU}
nuage::metadataagent::metadata_port: {get_param: NuageMetadataPort}
nuage::metadataagent::nova_metadata_port: {get_param: NuageNovaMetadataPort}
nuage::metadataagent::metadata_secret: {get_param: NuageMetadataProxySharedSecret}
nuage::metadataagent::nova_client_version: {get_param: NuageNovaClientVersion}
nuage::metadataagent::nova_os_username: {get_param: NuageNovaOsUsername}
nuage::metadataagent::metadata_agent_start_with_ovs: {get_param: NuageMetadataAgentStartWithOvs}
nuage::metadataagent::nova_api_endpoint_type: {get_param: NuageNovaApiEndpoint}
nuage::metadataagent::nova_region_name: {get_param: NuageNovaRegionName}
tripleo::profile::base::neutron::agents::nuage::nova_os_tenant_name: 'service'
tripleo::profile::base::neutron::agents::nuage::nova_os_password: {get_param: NovaPassword}
tripleo::profile::base::neutron::agents::nuage::nova_auth_ip: {get_param: [EndpointMap, KeystoneInternal, host]}
step_config: |
include tripleo::profile::base::neutron::agents::nuage

72
deployment/neutron/neutron-controller-plugin-nuage.yaml
View File

@ -1,72 +0,0 @@
heat_template_version: wallaby
description: >
OpenStack Neutron Nuage VRS
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. Use
parameter_merge_strategies to merge it with the defaults.
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
NuageActiveController:
description: IP address of the Active Virtualized Services Controller (VSC)
type: string
NuageStandbyController:
description: IP address of the Standby Virtualized Services Controller (VSC)
type: string
NuageBridgeMTU:
description: Support for non-default MTU configured on each VRS node
type: string
default: ''
NuageDisableDhcp4:
description: Make VRS act as Dhcp server or not
type: boolean
default: false
NuageControllerEnableMetadataAgent:
description: Enbale Nuage Metadata Agent on Controller or not
type: boolean
default: false
ControllerVxlanIPtableRule:
description: Open Vxlan Port on Controller node or not
type: boolean
default: false
outputs:
role_data:
description: Role data for the Neutron Controller Nuage plugin
value:
firewall_rules:
- if:
- {get_param: ControllerVxlanIPtableRule}
- '118 neutron vxlan networks':
proto: 'udp'
dport: 4789
service_name: neutron_controller_plugin_nuage
config_settings:
map_merge:
- nuage::vrs::active_controller: {get_param: NuageActiveController}
nuage::vrs::standby_controller: {get_param: NuageStandbyController}
nuage::vrs::bridge_mtu: {get_param: NuageBridgeMTU}
nuage::vrs::disable_dhcp4: {get_param: NuageDisableDhcp4}
tripleo::profile::base::neutron::agents::nuage::enable_metadata_agent: {get_param: NuageControllerEnableMetadataAgent}
step_config: |
include tripleo::profile::base::neutron::agents::nuage

114
deployment/neutron/neutron-plugin-ml2-nuage.yaml
View File

@ -1,114 +0,0 @@
heat_template_version: wallaby
description: >
OpenStack Neutron ML2/Nuage plugin configured with Puppet
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. Use
parameter_merge_strategies to merge it with the defaults.
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
# Config specific parameters, to be provided via parameter_defaults
NeutronNuageNetPartitionName:
description: Specifies the title that you will see on the VSD
type: string
default: 'default_name'
NeutronNuageVSDIp:
description: IP address and port of the Virtual Services Directory
type: string
NeutronNuageVSDUsername:
description: Username to be used to log into VSD
type: string
NeutronNuageVSDPassword:
description: Password to be used to log into VSD
type: string
NeutronNuageVSDOrganization:
description: Organization parameter required to log into VSD
type: string
default: 'organization'
NeutronNuageBaseURIVersion:
description: URI version to be used based on the VSD release
type: string
default: 'default_uri_version'
NeutronNuageCMSId:
description: Cloud Management System ID (CMS ID) to distinguish between OS instances on the same VSD
type: string
UseForwardedFor:
description: Treat X-Forwarded-For as the canonical remote address. Only enable this if you have a sanitizing proxy.
type: boolean
default: false
NovaPatchConfigMonkeyPatch:
description: Apply monkey patching or not
type: boolean
default: false
NovaPatchConfigMonkeyPatchModules:
description: List of modules/decorators to monkey patch
type: comma_delimited_list
default: ''
NuageDefaultAllowNonIP:
description: To allow non-IP traffic by default
type: boolean
default: false
resources:
NeutronMl2Base:
type: ./neutron-plugin-ml2.yaml
properties:
ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
RoleName: {get_param: RoleName}
RoleParameters: {get_param: RoleParameters}
outputs:
role_data:
description: Role data for the Neutron ML2/Nuage plugin
value:
service_name: neutron_plugin_ml2_nuage
config_settings:
map_merge:
- get_attr: [NeutronMl2Base, role_data, config_settings]
- neutron::plugins::ml2::nuage::nuage_net_partition_name: {get_param: NeutronNuageNetPartitionName}
neutron::plugins::ml2::nuage::nuage_vsd_ip: {get_param: NeutronNuageVSDIp}
neutron::plugins::ml2::nuage::nuage_vsd_username: {get_param: NeutronNuageVSDUsername}
neutron::plugins::ml2::nuage::nuage_vsd_password: {get_param: NeutronNuageVSDPassword}
neutron::plugins::ml2::nuage::nuage_vsd_organization: {get_param: NeutronNuageVSDOrganization}
neutron::plugins::ml2::nuage::nuage_base_uri_version: {get_param: NeutronNuageBaseURIVersion}
neutron::plugins::ml2::nuage::nuage_cms_id: {get_param: NeutronNuageCMSId}
neutron::plugins::ml2::nuage::nuage_default_allow_non_ip: {get_param: NuageDefaultAllowNonIP}
nova::api::use_forwarded_for: {get_param: UseForwardedFor}
nova::patch::config::monkey_patch: {get_param: NovaPatchConfigMonkeyPatch}
nova::patch::config::monkey_patch_modules: {get_param: NovaPatchConfigMonkeyPatchModules}
step_config: |
include tripleo::profile::base::neutron::plugins::ml2
metadata_settings:
get_attr: [NeutronMl2Base, role_data, metadata_settings]

3
environments/disable-neutron.yaml
View File

@ -1,5 +1,4 @@
resource_registry:
OS::TripleO::Services::ComputeNeutronCorePluginNuage: OS::Heat::None
OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::ComputeNeutronOvsDpdk: OS::Heat::None
@ -8,7 +7,6 @@ resource_registry:
OS::TripleO::Services::NeutronBgpVpnApi: OS::Heat::None
OS::TripleO::Services::NeutronBgpVpnBagpipe: OS::Heat::None
OS::TripleO::Services::NeutronCorePluginML2Ansible: OS::Heat::None
OS::TripleO::Services::NeutronCorePluginML2Nuage: OS::Heat::None
OS::TripleO::Services::NeutronCorePluginML2OVN: OS::Heat::None
OS::TripleO::Services::NeutronCorePluginMLNXSDN: OS::Heat::None
OS::TripleO::Services::NeutronCorePluginNSX: OS::Heat::None
@ -22,7 +20,6 @@ resource_registry:
OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
OS::TripleO::Services::NeutronMl2PluginBase: OS::Heat::None
OS::TripleO::Services::NeutronMlnxAgent: OS::Heat::None
OS::TripleO::Services::NeutronNuageVrs: OS::Heat::None
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::NeutronSfcApi: OS::Heat::None
OS::TripleO::Services::NeutronSriovAgent: OS::Heat::None

1
environments/neutron-bgpvpn.yaml
View File

@ -7,7 +7,6 @@
# - Bagpipe: BGPVPN:BaGPipe:networking_bgpvpn.neutron.services.service_drivers.bagpipe.bagpipe.BaGPipeBGPVPNDriver:default
# - OpenContrail: BGPVPN:OpenContrail:networking_bgpvpn.neutron.services.service_drivers.opencontrail.opencontrail.OpenContrailBGPVPNDriver:default
# - OpenDaylight: BGPVPN:OpenDaylight:networking_odl.bgpvpn.odl_v2.OpenDaylightBgpvpnDriver:default
# - Nuage: BGPVPN:Nuage:nuage_neutron.bgpvpn.services.service_drivers.driver.NuageBGPVPNDriver:default
resource_registry:
OS::TripleO::Services::NeutronBgpVpnApi: ../deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml

38
environments/neutron-nuage-config.yaml
View File

@ -1,38 +0,0 @@
# A Heat environment file which can be used to enable a
# a Neutron Nuage backend on the controller, configured via puppet
resource_registry:
OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None
OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
# Override the NeutronCorePlugin to use Nuage
OS::TripleO::Services::NeutronMl2PluginBase: OS::TripleO::Services::NeutronCorePluginML2Nuage
parameter_defaults:
NeutronNuageNetPartitionName: 'default_name'
NeutronNuageVSDIp: '0.0.0.0:0'
NeutronNuageVSDUsername: 'username'
NeutronNuageVSDPassword: 'password'
NeutronNuageVSDOrganization: 'organization'
NeutronNuageBaseURIVersion: 'default_uri_version'
NeutronNuageCMSId: ''
UseForwardedFor: true
NeutronPluginMl2PuppetTags: 'neutron_plugin_ml2,neutron_plugin_nuage'
NeutronServicePlugins: ''
NeutronDBSyncExtraParams: '--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini'
NeutronTypeDrivers: ''
NeutronNetworkType: ''
NeutronMechanismDrivers: ''
NeutronPluginExtensions: ''
NeutronFlatNetworks: ''
NeutronTunnelIdRanges: ''
NeutronNetworkVLANRanges: ''
NeutronVniRanges: ''
NovaPatchConfigMonkeyPatch: false
NovaPatchConfigMonkeyPatchModules: ''
NovaOVSBridge: 'default_bridge'
NeutronMetadataProxySharedSecret: 'default'
InstanceNameTemplate: 'inst-%08x'
ControllerExtraConfig:
neutron::api_extensions_path: '/usr/lib/python2.7/site-packages/neutron/plugins/nuage/'

12
environments/nova-nuage-config.yaml
View File

@ -1,12 +0,0 @@
# A Heat environment file which can be used to enable
# Nuage backend on the compute, configured via puppet
resource_registry:
OS::TripleO::Services::ComputeNeutronCorePlugin: OS::TripleO::Services::ComputeNeutronCorePluginNuage
parameter_defaults:
NuageActiveController: '0.0.0.0'
NuageStandbyController: '0.0.0.0'
NovaOVSBridge: 'default_bridge'
NovaComputeLibvirtType: 'default_type'
NuageMetadataProxySharedSecret: 'default'
NuageNovaApiEndpoint: 'default_endpoint'

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

@ -150,10 +150,8 @@ resource_registry:
# can be the same as NeutronCorePlugin but some vendors install different
# things where VMs run
OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
OS::TripleO::Services::ComputeNeutronCorePluginNuage: deployment/neutron/neutron-compute-plugin-nuage.yaml
# Neutron Core Plugin Vendors (these typically override NeutronCorePlugin)
OS::TripleO::Services::NeutronCorePluginML2OVN: deployment/neutron/neutron-plugin-ml2-ovn.yaml
OS::TripleO::Services::NeutronCorePluginML2Nuage: deployment/neutron/neutron-plugin-ml2-nuage.yaml
OS::TripleO::Services::NeutronCorePluginNSX: deployment/neutron/neutron-plugin-nsx-container-puppet.yaml
OS::TripleO::Services::OVNDBs: deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
OS::TripleO::Services::OVNController: deployment/ovn/ovn-controller-container-puppet.yaml
@ -162,7 +160,6 @@ resource_registry:
OS::TripleO::Services::NeutronCorePluginMLNXSDN: deployment/neutron/neutron-plugin-ml2-mlnx-sdn-assist-container-puppet.yaml
OS::TripleO::Services::NeutronCorePluginVTS: deployment/neutron/neutron-plugin-ml2-cisco-vts-container-puppet.yaml
OS::TripleO::Services::NeutronCorePluginML2Ansible: deployment/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml
OS::TripleO::Services::NeutronNuageVrs: deployment/neutron/neutron-controller-plugin-nuage.yaml
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::NeutronLinuxbridgeAgent: OS::Heat::None
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None