diff --git a/ci/environments/scenario000-standalone.yaml b/ci/environments/scenario000-standalone.yaml index 8a974f0c05..7e90a714ae 100644 --- a/ci/environments/scenario000-standalone.yaml +++ b/ci/environments/scenario000-standalone.yaml @@ -105,7 +105,6 @@ resource_registry: OS::TripleO::Services::NeutronCorePluginML2Ansible: OS::Heat::None OS::TripleO::Services::NeutronCorePluginML2OVN: OS::Heat::None OS::TripleO::Services::NeutronCorePluginMLNXSDN: OS::Heat::None - OS::TripleO::Services::NeutronCorePluginNSX: OS::Heat::None OS::TripleO::Services::NeutronCorePluginVTS: OS::Heat::None OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None OS::TripleO::Services::NeutronL2gwAgent: OS::Heat::None diff --git a/deployment/neutron/neutron-plugin-nsx-container-puppet.yaml b/deployment/neutron/neutron-plugin-nsx-container-puppet.yaml deleted file mode 100644 index 8d9340f6b5..0000000000 --- a/deployment/neutron/neutron-plugin-nsx-container-puppet.yaml +++ /dev/null @@ -1,125 +0,0 @@ -heat_template_version: wallaby - -description: > - OpenStack containerized Neutron NSX Plugin configured with Puppet - -parameters: - EndpointMap: - default: {} - description: Mapping of service endpoint -> protocol. Typically set - via parameter_defaults in the resource registry. - type: json - 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 - ContainerNeutronConfigImage: - description: The container image to use for the neutron config_volume - type: string - tags: - - role_specific - RoleName: - default: '' - description: Role name on which the service is applied - type: string - RoleParameters: - default: {} - description: Parameters specific to the role - type: json - NeutronPluginNsxPuppetTags: - default: 'neutron_plugin_nsx' - description: Puppet resource tag names that are used to generate config files with puppet - type: string - DefaultOverlayTz: - description: Name or UUID of the default NSX overlay transport zone. - type: string - DefaultVlanTz: - default: '' - description: Name or UUID of the default NSX VLAN transport zone. - type: string - DefaultBridgeCluster: - default: '' - description: Name or UUID of the default NSX bridge cluster that will be - used to perform L2 gateway bridging between VXLAN and VLAN - networks. - type: string - DefaultTier0Router: - description: UUID of the default tier0 router that will be used for connecting to - tier1 logical routers and configuring external networks. - type: string - NsxApiManagers: - description: IP address of one or more NSX managers separated by commas. - type: string - NsxApiUser: - description: User name of NSX Manager. - type: string - NsxApiPassword: - description: Password of NSX Manager. - type: string - NativeDhcpMetadata: - default: True - description: This is the flag to indicate if using native DHCP/Metadata or not. - type: boolean - DhcpProfile: - description: This is the name or UUID of the NSX DHCP Profile that will be - used to enable native DHCP service. - type: string - MetadataProxy: - description: This is the name or UUID of the NSX Metadata Proxy that will - be used to enable native metadata service. - type: string - DhcpRelayService: - default: '' - description: This is the name or UUID of the NSX relay service that will - be used to enable DHCP relay on router ports. - type: string - -resources: - - RoleParametersValue: - type: OS::Heat::Value - properties: - type: json - value: - map_replace: - - map_replace: - - ContainerNeutronConfigImage: ContainerNeutronConfigImage - - values: {get_param: [RoleParameters]} - - values: - ContainerNeutronConfigImage: {get_param: ContainerNeutronConfigImage} - -outputs: - role_data: - description: Role data for the Neutron NSX Plugin role. - value: - service_name: neutron_plugin_nsx - config_settings: - neutron::plugins::nsx::default_overlay_tz: {get_param: DefaultOverlayTz} - neutron::plugins::nsx::default_vlan_tz: {get_param: DefaultVlanTz} - neutron::plugins::nsx::default_bridge_cluster: {get_param: DefaultBridgeCluster} - neutron::plugins::nsx::default_tier0_router: {get_param: DefaultTier0Router} - neutron::plugins::nsx::nsx_api_managers: {get_param: NsxApiManagers} - neutron::plugins::nsx::nsx_api_user: {get_param: NsxApiUser} - neutron::plugins::nsx::nsx_api_password: {get_param: NsxApiPassword} - neutron::plugins::nsx::native_dhcp_metadata: {get_param: NativeDhcpMetadata} - neutron::plugins::nsx::dhcp_profile: {get_param: DhcpProfile} - neutron::plugins::nsx::dhcp_relay_service: {get_param: DhcpRelayService} - neutron::plugins::nsx::metadata_proxy: {get_param: MetadataProxy} - service_config_settings: {} - metadata_settings: {} - # BEGIN DOCKER SETTINGS - puppet_config: - config_volume: 'neutron' - puppet_tags: {get_param: NeutronPluginNsxPuppetTags} - step_config: - get_attr: | - include tripleo::profile::base::neutron::plugins::nsx - config_image: {get_attr: [RoleParametersValue, value, ContainerNeutronConfigImage]} - kolla_config: {} - docker_config: {} diff --git a/environments/disable-neutron.yaml b/environments/disable-neutron.yaml index dcb211acda..da7f36a57b 100644 --- a/environments/disable-neutron.yaml +++ b/environments/disable-neutron.yaml @@ -9,7 +9,6 @@ resource_registry: OS::TripleO::Services::NeutronCorePluginML2Ansible: OS::Heat::None OS::TripleO::Services::NeutronCorePluginML2OVN: OS::Heat::None OS::TripleO::Services::NeutronCorePluginMLNXSDN: OS::Heat::None - OS::TripleO::Services::NeutronCorePluginNSX: OS::Heat::None OS::TripleO::Services::NeutronCorePlugin: OS::Heat::None OS::TripleO::Services::NeutronCorePluginVTS: OS::Heat::None OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None diff --git a/environments/neutron-nsx.yaml b/environments/neutron-nsx.yaml deleted file mode 100644 index 8517e9200b..0000000000 --- a/environments/neutron-nsx.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# A Heat environment that can be used to deploy NSX Services -# extensions, configured via puppet -resource_registry: - # NSX doesn't require dhcp, l3, metadata, and ovs agents - 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 Neutron core plugin to use NSX - OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginNSX - OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None - -parameter_defaults: - NeutronCorePlugin: vmware_nsx.plugin.NsxV3Plugin - DhcpAgentNotification: false - NeutronServicePlugins: 'qos' diff --git a/environments/nsx-config.yaml b/environments/nsx-config.yaml deleted file mode 100644 index d0e2e110a8..0000000000 --- a/environments/nsx-config.yaml +++ /dev/null @@ -1,22 +0,0 @@ -resource_registry: - OS::TripleO::Services::NeutronCorePluginNSX: ../deployment/neutron/neutron-plugin-nsx-container-puppet.yaml - -parameter_defaults: - # Default overlay tz uuid - DefaultOverlayTz: '' - - DefaultVlanTz: '' - # Default tier0 router uuid - DefaultTier0Router: '' - # NSX API managers - NsxApiManagers: '' - # NSX API user - NsxApiUser: '' - # NSX API password - NsxApiPassword: '' - # Enable native DHCP and Metadata - NativeDhcpMetadata: True - # Default DHCP profile uuid - DhcpProfile: '' - # Default Metadata Proxy uuid - MetadataProxy: '' diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 45e1514b47..f972b5294b 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -136,7 +136,6 @@ resource_registry: OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None # Neutron Core Plugin Vendors (these typically override NeutronCorePlugin) OS::TripleO::Services::NeutronCorePluginML2OVN: deployment/neutron/neutron-plugin-ml2-ovn.yaml - OS::TripleO::Services::NeutronCorePluginNSX: deployment/neutron/neutron-plugin-nsx-container-puppet.yaml OS::TripleO::Services::OVNDBs: deployment/ovn/ovn-dbs-cluster-ansible.yaml OS::TripleO::Services::OVNController: deployment/ovn/ovn-controller-container-puppet.yaml OS::TripleO::Services::OvsDpdkNetcontrold: OS::Heat::None diff --git a/releasenotes/notes/remove-nsx-support-e118640eebf0ce23.yaml b/releasenotes/notes/remove-nsx-support-e118640eebf0ce23.yaml new file mode 100644 index 0000000000..342af99b2f --- /dev/null +++ b/releasenotes/notes/remove-nsx-support-e118640eebf0ce23.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Support for NSX Neutron plugin has been removed. Because of this removal, + the ``OS::TripleO::Services::NeutronCorePluginNSX`` service should be + removed from roles data during upgrade.