From 4ecf3ecaa47a61b33477821fd1d2c15d301081ca Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 16 Nov 2022 10:21:45 +0900 Subject: [PATCH] Remove support for VPP and Neutron ML2/VPP plugin These services were deprecated during Xena cycle by [1]. Since we have created the Zed release, now we can remove the features deprecated before that. [1] 18651160a96632d24291a16803af612221fa61a8 Change-Id: Ib248ec4bec57a5d747a1cf35157084d2cb51b566 --- ci/custom_ci_roles_data.yaml | 4 -- ci/environments/scenario000-standalone.yaml | 2 - .../neutron-vpp-agent-baremetal-puppet.yaml | 57 --------------- .../deprecated/vpp/vpp-baremetal-puppet.yaml | 69 ------------------- environments/disable-neutron.yaml | 1 - environments/neutron-ml2-vpp.yaml | 20 ------ environments/services/vpp.yaml | 9 --- overcloud-resource-registry-puppet.j2.yaml | 2 - .../notes/remove-vpp-d950a159ad7b3371.yaml | 4 ++ roles/CellController.yaml | 1 - roles/Compute.yaml | 2 - roles/ComputeAlt.yaml | 2 - roles/ComputeDVR.yaml | 2 - roles/ComputeHCI.yaml | 2 - roles/ComputeHCISriov.yaml | 2 - roles/ComputeInstanceHA.yaml | 2 - roles/ComputeLocalEphemeral.yaml | 2 - roles/ComputePPC64LE.yaml | 2 - roles/ComputeRBDEphemeral.yaml | 2 - roles/ComputeRealTime.yaml | 2 - roles/ComputeSriov.yaml | 2 - roles/ComputeSriovIB.yaml | 2 - roles/ComputeSriovRT.yaml | 2 - roles/ComputeVdpa.yaml | 2 - roles/Controller.yaml | 2 - roles/ControllerAllNovaStandalone.yaml | 1 - roles/ControllerNoCeph.yaml | 2 - roles/ControllerNovaStandalone.yaml | 2 - roles/ControllerOpenstack.yaml | 1 - roles/ControllerSriov.yaml | 2 - roles/ControllerStorageDashboard.yaml | 2 - roles/ControllerStorageNfs.yaml | 2 - roles/DistributedCompute.yaml | 2 - roles/DistributedComputeHCI.yaml | 2 - roles/DistributedComputeHCIDashboard.yaml | 2 - roles/DistributedComputeHCIScaleOut.yaml | 2 - roles/DistributedComputeScaleOut.yaml | 2 - roles/HciCephAll.yaml | 2 - roles/HciCephFile.yaml | 2 - roles/HciCephMon.yaml | 2 - roles/HciCephObject.yaml | 2 - roles/Networker.yaml | 1 - roles/NetworkerSriov.yaml | 1 - roles/README.rst | 2 - roles/Standalone.yaml | 2 - roles_data.yaml | 4 -- tools/yaml-validate.py | 2 - 47 files changed, 4 insertions(+), 237 deletions(-) delete mode 100644 deployment/deprecated/neutron/neutron-vpp-agent-baremetal-puppet.yaml delete mode 100644 deployment/deprecated/vpp/vpp-baremetal-puppet.yaml delete mode 100644 environments/neutron-ml2-vpp.yaml delete mode 100644 environments/services/vpp.yaml create mode 100644 releasenotes/notes/remove-vpp-d950a159ad7b3371.yaml diff --git a/ci/custom_ci_roles_data.yaml b/ci/custom_ci_roles_data.yaml index 7155bcf9d4..607d80f1d4 100644 --- a/ci/custom_ci_roles_data.yaml +++ b/ci/custom_ci_roles_data.yaml @@ -137,7 +137,6 @@ - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronMetadataAgent - OS::TripleO::Services::NeutronOvsAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NeutronAgentsIBConfig - OS::TripleO::Services::NovaApi - OS::TripleO::Services::NovaConductor @@ -176,7 +175,6 @@ - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Tuned - OS::TripleO::Services::Unbound - - OS::TripleO::Services::Vpp ############################################################################### # Role: Compute # ############################################################################### @@ -232,7 +230,6 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt @@ -251,6 +248,5 @@ - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Tuned - - OS::TripleO::Services::Vpp - OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNMetadataAgent diff --git a/ci/environments/scenario000-standalone.yaml b/ci/environments/scenario000-standalone.yaml index e3a3657b32..e31734fbe4 100644 --- a/ci/environments/scenario000-standalone.yaml +++ b/ci/environments/scenario000-standalone.yaml @@ -114,7 +114,6 @@ resource_registry: OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None OS::TripleO::Services::NeutronSfcApi: OS::Heat::None OS::TripleO::Services::NeutronSriovAgent: OS::Heat::None - OS::TripleO::Services::NeutronVppAgent: OS::Heat::None OS::TripleO::Services::NovaAZConfig: OS::Heat::None OS::TripleO::Services::NovaApi: OS::Heat::None OS::TripleO::Services::NovaCompute: OS::Heat::None @@ -160,7 +159,6 @@ resource_registry: OS::TripleO::Services::Unbound: OS::Heat::None OS::TripleO::Services::UndercloudTLS: OS::Heat::None OS::TripleO::Services::UndercloudUpgrade: OS::Heat::None - OS::TripleO::Services::Vpp: OS::Heat::None parameter_defaults: Debug: true NotificationDriver: 'noop' diff --git a/deployment/deprecated/neutron/neutron-vpp-agent-baremetal-puppet.yaml b/deployment/deprecated/neutron/neutron-vpp-agent-baremetal-puppet.yaml deleted file mode 100644 index 59684f9b81..0000000000 --- a/deployment/deprecated/neutron/neutron-vpp-agent-baremetal-puppet.yaml +++ /dev/null @@ -1,57 +0,0 @@ -heat_template_version: wallaby - -description: > - OpenStack Neutron ML2/VPP agent 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 - NeutronVPPAgentPhysnets: - description: > - List of : - Example: "physnet1:GigabitEthernet2/2/0,physnet2:GigabitEthernet2/3/0" - type: comma_delimited_list - default: "" - -resources: - NeutronBase: - type: ./neutron-base.yaml - properties: - ServiceData: {get_param: ServiceData} - ServiceNetMap: {get_param: ServiceNetMap} - EndpointMap: {get_param: EndpointMap} - -outputs: - role_data: - description: Role data for the Neutron ML2/VPP agent service. - value: - service_name: neutron_vpp_agent - config_settings: - map_merge: - - get_attr: [NeutronBase, role_data, config_settings] - - tripleo::profile::base::neutron::agents::vpp::physnet_mapping: {get_param: NeutronVPPAgentPhysnets} - step_config: | - include tripleo::profile::base::neutron::agents::vpp - metadata_settings: - get_attr: [NeutronBase, role_data, metadata_settings] diff --git a/deployment/deprecated/vpp/vpp-baremetal-puppet.yaml b/deployment/deprecated/vpp/vpp-baremetal-puppet.yaml deleted file mode 100644 index 486446b917..0000000000 --- a/deployment/deprecated/vpp/vpp-baremetal-puppet.yaml +++ /dev/null @@ -1,69 +0,0 @@ -heat_template_version: wallaby - -description: > - Vpp service 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 - VppCpuMainCore: - default: '' - description: VPP main thread core pinning. - type: string - VppCpuCorelistWorkers: - default: '' - description: List of cores for VPP worker thread pinning - type: string - MonitoringSubscriptionVpp: - default: 'overcloud-vpp' - type: string - -outputs: - role_data: - description: Role data for the Vpp role. - value: - service_name: vpp - monitoring_subscription: {get_param: MonitoringSubscriptionVpp} - config_settings: - fdio::vpp_cpu_main_core: {get_param: VppCpuMainCore} - fdio::vpp_cpu_corelist_workers: {get_param: VppCpuCorelistWorkers} - step_config: | - include tripleo::profile::base::vpp - upgrade_tasks: - - name: Check if vpp is deployed - command: systemctl is-enabled vpp - tags: common - failed_when: false - register: vpp_enabled - - name: "PreUpgrade step0,validation: Check service vpp is running" - shell: /usr/bin/systemctl show 'vpp' --property ActiveState | grep '\bactive\b' - when: - - step|int == 0 - - vpp_enabled.rc == 0 - tags: validation - - name: Stop vpp service - when: - - step|int == 1 - - vpp_enabled.rc == 0 - service: name=vpp state=stopped diff --git a/environments/disable-neutron.yaml b/environments/disable-neutron.yaml index ff6677366e..c479d26499 100644 --- a/environments/disable-neutron.yaml +++ b/environments/disable-neutron.yaml @@ -21,4 +21,3 @@ resource_registry: OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None OS::TripleO::Services::NeutronSfcApi: OS::Heat::None OS::TripleO::Services::NeutronSriovAgent: OS::Heat::None - OS::TripleO::Services::NeutronVppAgent: OS::Heat::None diff --git a/environments/neutron-ml2-vpp.yaml b/environments/neutron-ml2-vpp.yaml deleted file mode 100644 index 71c1f29729..0000000000 --- a/environments/neutron-ml2-vpp.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# Environment file used to enable networking-vpp ML2 mechanism driver - -resource_registry: - OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None - OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None - OS::TripleO::Services::NeutronVppAgent: ../deployment/deprecated/neutron/neutron-vpp-agent-baremetal-puppet.yaml - OS::TripleO::Services::Etcd: ../deployment/etcd/etcd-container-ansible.yaml - # FIXME(bogdando): switch it, once it is containerized - OS::TripleO::Services::Vpp: ../deployment/deprecated/vpp/vpp-baremetal-puppet.yaml - -parameter_defaults: - #Comma delimited list of :. - #Example: "datacentre:GigabitEthernet2/2/0" - #NeutronVPPAgentPhysnets: "" - - NeutronMechanismDrivers: vpp - NeutronNetworkType: vlan - NeutronServicePlugins: router - NeutronTypeDrivers: vlan,flat - NeutronInterfaceDriver: 'neutron.agent.linux.interface.BridgeInterfaceDriver' diff --git a/environments/services/vpp.yaml b/environments/services/vpp.yaml deleted file mode 100644 index 4aee979051..0000000000 --- a/environments/services/vpp.yaml +++ /dev/null @@ -1,9 +0,0 @@ -resource_registry: - OS::TripleO::Services::Vpp: ../../deployment/deprecated/vpp/vpp-baremetal-puppet.yaml - -#parameter_defaults: - #VPP main thread core pinning - #VppCpuMainCore: '1' - - #List of cores for VPP worker thread pinning - #VppCpuCorelistWorkers: ['3','4'] diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index c41fe8025d..ffc81e2228 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -271,8 +271,6 @@ resource_registry: OS::TripleO::Services::OctaviaWorker: OS::Heat::None OS::TripleO::Services::OctaviaDeploymentConfig: OS::Heat::None OS::TripleO::Services::MySQLClient: deployment/database/mysql-client.yaml - OS::TripleO::Services::Vpp: OS::Heat::None - OS::TripleO::Services::NeutronVppAgent: OS::Heat::None OS::TripleO::Services::Podman: deployment/podman/podman-baremetal-ansible.yaml OS::TripleO::Services::Docker: OS::Heat::None OS::TripleO::Services::DockerRegistry: OS::Heat::None diff --git a/releasenotes/notes/remove-vpp-d950a159ad7b3371.yaml b/releasenotes/notes/remove-vpp-d950a159ad7b3371.yaml new file mode 100644 index 0000000000..99466d9f81 --- /dev/null +++ b/releasenotes/notes/remove-vpp-d950a159ad7b3371.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Support for VPP service and Neutron ML2/VPP plugin have been removed. diff --git a/roles/CellController.yaml b/roles/CellController.yaml index 23b76d65f5..e21d046b0c 100644 --- a/roles/CellController.yaml +++ b/roles/CellController.yaml @@ -61,4 +61,3 @@ - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Tuned - - OS::TripleO::Services::Vpp diff --git a/roles/Compute.yaml b/roles/Compute.yaml index 7ddfff908f..0dd5717136 100644 --- a/roles/Compute.yaml +++ b/roles/Compute.yaml @@ -54,7 +54,6 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt @@ -73,6 +72,5 @@ - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Tuned - - OS::TripleO::Services::Vpp - OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNMetadataAgent diff --git a/roles/ComputeAlt.yaml b/roles/ComputeAlt.yaml index 9b3be8e6a5..f8b547a1e2 100644 --- a/roles/ComputeAlt.yaml +++ b/roles/ComputeAlt.yaml @@ -38,7 +38,6 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaComputeAlt - OS::TripleO::Services::NovaLibvirtAlt @@ -54,5 +53,4 @@ - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Tuned - - OS::TripleO::Services::Vpp - OS::TripleO::Services::OVNControllerAlt diff --git a/roles/ComputeDVR.yaml b/roles/ComputeDVR.yaml index 578e8bf097..d4c0241637 100644 --- a/roles/ComputeDVR.yaml +++ b/roles/ComputeDVR.yaml @@ -44,7 +44,6 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt @@ -63,6 +62,5 @@ - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Tuned - - OS::TripleO::Services::Vpp - OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNMetadataAgent diff --git a/roles/ComputeHCI.yaml b/roles/ComputeHCI.yaml index 8acb7bd61e..30b2719690 100644 --- a/roles/ComputeHCI.yaml +++ b/roles/ComputeHCI.yaml @@ -46,7 +46,6 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt @@ -65,6 +64,5 @@ - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Tuned - - OS::TripleO::Services::Vpp - OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNMetadataAgent diff --git a/roles/ComputeHCISriov.yaml b/roles/ComputeHCISriov.yaml index 7dde7a18f6..a9f33b3862 100644 --- a/roles/ComputeHCISriov.yaml +++ b/roles/ComputeHCISriov.yaml @@ -45,7 +45,6 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronSriovAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt - OS::TripleO::Services::NovaLibvirtGuests @@ -59,7 +58,6 @@ - OS::TripleO::Services::Timezone - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages - - OS::TripleO::Services::Vpp - OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNMetadataAgent - OS::TripleO::Services::Ptp diff --git a/roles/ComputeInstanceHA.yaml b/roles/ComputeInstanceHA.yaml index 3f0e0a5e45..3a191dd337 100644 --- a/roles/ComputeInstanceHA.yaml +++ b/roles/ComputeInstanceHA.yaml @@ -44,7 +44,6 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt @@ -64,6 +63,5 @@ - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Tuned - - OS::TripleO::Services::Vpp - OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNMetadataAgent diff --git a/roles/ComputeLocalEphemeral.yaml b/roles/ComputeLocalEphemeral.yaml index a01e88f4c9..bc87ad17cc 100644 --- a/roles/ComputeLocalEphemeral.yaml +++ b/roles/ComputeLocalEphemeral.yaml @@ -46,7 +46,6 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt @@ -65,6 +64,5 @@ - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Tuned - - OS::TripleO::Services::Vpp - OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNMetadataAgent diff --git a/roles/ComputePPC64LE.yaml b/roles/ComputePPC64LE.yaml index 124e53e290..0825b7de94 100644 --- a/roles/ComputePPC64LE.yaml +++ b/roles/ComputePPC64LE.yaml @@ -44,7 +44,6 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt @@ -63,6 +62,5 @@ - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Tuned - - OS::TripleO::Services::Vpp - OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNMetadataAgent diff --git a/roles/ComputeRBDEphemeral.yaml b/roles/ComputeRBDEphemeral.yaml index 8b577c9199..906c5df1d5 100644 --- a/roles/ComputeRBDEphemeral.yaml +++ b/roles/ComputeRBDEphemeral.yaml @@ -46,7 +46,6 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt @@ -65,6 +64,5 @@ - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Tuned - - OS::TripleO::Services::Vpp - OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNMetadataAgent diff --git a/roles/ComputeRealTime.yaml b/roles/ComputeRealTime.yaml index fca6c485a9..51093849b1 100644 --- a/roles/ComputeRealTime.yaml +++ b/roles/ComputeRealTime.yaml @@ -54,7 +54,6 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt @@ -72,6 +71,5 @@ - OS::TripleO::Services::Timezone - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages - - OS::TripleO::Services::Vpp - OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNMetadataAgent diff --git a/roles/ComputeSriov.yaml b/roles/ComputeSriov.yaml index 5e8223aa6c..8b5ebf86a1 100644 --- a/roles/ComputeSriov.yaml +++ b/roles/ComputeSriov.yaml @@ -42,7 +42,6 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronSriovAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt @@ -60,6 +59,5 @@ - OS::TripleO::Services::Timezone - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages - - OS::TripleO::Services::Vpp - OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNMetadataAgent diff --git a/roles/ComputeSriovIB.yaml b/roles/ComputeSriovIB.yaml index f3c659a389..25f8653874 100644 --- a/roles/ComputeSriovIB.yaml +++ b/roles/ComputeSriovIB.yaml @@ -43,7 +43,6 @@ - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronSriovAgent - OS::TripleO::Services::NeutronMlnxAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt - OS::TripleO::Services::NovaLibvirtGuests @@ -60,6 +59,5 @@ - OS::TripleO::Services::Timezone - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages - - OS::TripleO::Services::Vpp - OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNMetadataAgent diff --git a/roles/ComputeSriovRT.yaml b/roles/ComputeSriovRT.yaml index 53d7f3714d..30c05618f9 100644 --- a/roles/ComputeSriovRT.yaml +++ b/roles/ComputeSriovRT.yaml @@ -45,7 +45,6 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronSriovAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt @@ -63,6 +62,5 @@ - OS::TripleO::Services::Timezone - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages - - OS::TripleO::Services::Vpp - OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNMetadataAgent diff --git a/roles/ComputeVdpa.yaml b/roles/ComputeVdpa.yaml index 9a2106daf2..571eed2831 100644 --- a/roles/ComputeVdpa.yaml +++ b/roles/ComputeVdpa.yaml @@ -47,7 +47,6 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronSriovAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt @@ -65,6 +64,5 @@ - OS::TripleO::Services::Timezone - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages - - OS::TripleO::Services::Vpp - OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNMetadataAgent diff --git a/roles/Controller.yaml b/roles/Controller.yaml index af2f4cc926..587f6a13a8 100644 --- a/roles/Controller.yaml +++ b/roles/Controller.yaml @@ -136,7 +136,6 @@ - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronMetadataAgent - OS::TripleO::Services::NeutronOvsAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NeutronAgentsIBConfig - OS::TripleO::Services::NovaApi - OS::TripleO::Services::NovaConductor @@ -175,4 +174,3 @@ - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Tuned - OS::TripleO::Services::Unbound - - OS::TripleO::Services::Vpp diff --git a/roles/ControllerAllNovaStandalone.yaml b/roles/ControllerAllNovaStandalone.yaml index ca1ab12b94..797a42d967 100644 --- a/roles/ControllerAllNovaStandalone.yaml +++ b/roles/ControllerAllNovaStandalone.yaml @@ -123,4 +123,3 @@ - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Tuned - OS::TripleO::Services::Unbound - - OS::TripleO::Services::Vpp diff --git a/roles/ControllerNoCeph.yaml b/roles/ControllerNoCeph.yaml index b02c4ff3df..82d2ccd658 100644 --- a/roles/ControllerNoCeph.yaml +++ b/roles/ControllerNoCeph.yaml @@ -124,7 +124,6 @@ - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronMetadataAgent - OS::TripleO::Services::NeutronOvsAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NeutronAgentsIBConfig - OS::TripleO::Services::NovaApi - OS::TripleO::Services::NovaConductor @@ -163,4 +162,3 @@ - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Tuned - OS::TripleO::Services::Unbound - - OS::TripleO::Services::Vpp diff --git a/roles/ControllerNovaStandalone.yaml b/roles/ControllerNovaStandalone.yaml index 6651249fc7..4c175edf9e 100644 --- a/roles/ControllerNovaStandalone.yaml +++ b/roles/ControllerNovaStandalone.yaml @@ -126,7 +126,6 @@ - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronMetadataAgent - OS::TripleO::Services::NeutronOvsAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NeutronAgentsIBConfig - OS::TripleO::Services::NovaIronic - OS::TripleO::Services::ContainersLogrotateCrond @@ -159,4 +158,3 @@ - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Tuned - OS::TripleO::Services::Unbound - - OS::TripleO::Services::Vpp diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml index 6568932a67..b4d37ecd9b 100644 --- a/roles/ControllerOpenstack.yaml +++ b/roles/ControllerOpenstack.yaml @@ -136,4 +136,3 @@ - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Tuned - OS::TripleO::Services::Unbound - - OS::TripleO::Services::Vpp diff --git a/roles/ControllerSriov.yaml b/roles/ControllerSriov.yaml index d6f413d779..fcf82f73b8 100644 --- a/roles/ControllerSriov.yaml +++ b/roles/ControllerSriov.yaml @@ -133,7 +133,6 @@ - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronMetadataAgent - OS::TripleO::Services::NeutronOvsAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NeutronAgentsIBConfig - OS::TripleO::Services::NovaApi - OS::TripleO::Services::NovaConductor @@ -173,4 +172,3 @@ - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Tuned - OS::TripleO::Services::Unbound - - OS::TripleO::Services::Vpp diff --git a/roles/ControllerStorageDashboard.yaml b/roles/ControllerStorageDashboard.yaml index b0c59acae0..85dbe91e6c 100644 --- a/roles/ControllerStorageDashboard.yaml +++ b/roles/ControllerStorageDashboard.yaml @@ -135,7 +135,6 @@ - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronMetadataAgent - OS::TripleO::Services::NeutronOvsAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NeutronAgentsIBConfig - OS::TripleO::Services::NovaApi - OS::TripleO::Services::NovaConductor @@ -174,4 +173,3 @@ - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Tuned - OS::TripleO::Services::Unbound - - OS::TripleO::Services::Vpp diff --git a/roles/ControllerStorageNfs.yaml b/roles/ControllerStorageNfs.yaml index 6ccf63fd90..f389726ad6 100644 --- a/roles/ControllerStorageNfs.yaml +++ b/roles/ControllerStorageNfs.yaml @@ -135,7 +135,6 @@ - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronMetadataAgent - OS::TripleO::Services::NeutronOvsAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NeutronAgentsIBConfig - OS::TripleO::Services::NovaApi - OS::TripleO::Services::NovaConductor @@ -174,4 +173,3 @@ - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Tuned - OS::TripleO::Services::Unbound - - OS::TripleO::Services::Vpp diff --git a/roles/DistributedCompute.yaml b/roles/DistributedCompute.yaml index 6dcf59a7b2..198def1781 100644 --- a/roles/DistributedCompute.yaml +++ b/roles/DistributedCompute.yaml @@ -46,7 +46,6 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt @@ -65,6 +64,5 @@ - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Tuned - - OS::TripleO::Services::Vpp - OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNMetadataAgent diff --git a/roles/DistributedComputeHCI.yaml b/roles/DistributedComputeHCI.yaml index a2353dcf56..c9166a89b6 100644 --- a/roles/DistributedComputeHCI.yaml +++ b/roles/DistributedComputeHCI.yaml @@ -55,7 +55,6 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt @@ -74,6 +73,5 @@ - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Tuned - - OS::TripleO::Services::Vpp - OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNMetadataAgent diff --git a/roles/DistributedComputeHCIDashboard.yaml b/roles/DistributedComputeHCIDashboard.yaml index 142294ac83..329d9ab3af 100644 --- a/roles/DistributedComputeHCIDashboard.yaml +++ b/roles/DistributedComputeHCIDashboard.yaml @@ -57,7 +57,6 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt @@ -76,6 +75,5 @@ - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Tuned - - OS::TripleO::Services::Vpp - OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNMetadataAgent diff --git a/roles/DistributedComputeHCIScaleOut.yaml b/roles/DistributedComputeHCIScaleOut.yaml index f46d5ed45e..37eb3b350d 100644 --- a/roles/DistributedComputeHCIScaleOut.yaml +++ b/roles/DistributedComputeHCIScaleOut.yaml @@ -47,7 +47,6 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt @@ -66,6 +65,5 @@ - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Tuned - - OS::TripleO::Services::Vpp - OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNMetadataAgent diff --git a/roles/DistributedComputeScaleOut.yaml b/roles/DistributedComputeScaleOut.yaml index 4dbd93e3f9..e8edaa72d6 100644 --- a/roles/DistributedComputeScaleOut.yaml +++ b/roles/DistributedComputeScaleOut.yaml @@ -44,7 +44,6 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt @@ -63,6 +62,5 @@ - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Tuned - - OS::TripleO::Services::Vpp - OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNMetadataAgent diff --git a/roles/HciCephAll.yaml b/roles/HciCephAll.yaml index eaf1df1c62..f5c6b9d7b8 100644 --- a/roles/HciCephAll.yaml +++ b/roles/HciCephAll.yaml @@ -52,7 +52,6 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt @@ -71,6 +70,5 @@ - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Tuned - - OS::TripleO::Services::Vpp - OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNMetadataAgent diff --git a/roles/HciCephFile.yaml b/roles/HciCephFile.yaml index 6d94f13d1a..797abd5962 100644 --- a/roles/HciCephFile.yaml +++ b/roles/HciCephFile.yaml @@ -46,7 +46,6 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt @@ -65,6 +64,5 @@ - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Tuned - - OS::TripleO::Services::Vpp - OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNMetadataAgent diff --git a/roles/HciCephMon.yaml b/roles/HciCephMon.yaml index f7879663dd..ef606e709b 100644 --- a/roles/HciCephMon.yaml +++ b/roles/HciCephMon.yaml @@ -47,7 +47,6 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt @@ -66,6 +65,5 @@ - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Tuned - - OS::TripleO::Services::Vpp - OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNMetadataAgent diff --git a/roles/HciCephObject.yaml b/roles/HciCephObject.yaml index f17c53aa1b..021e016668 100644 --- a/roles/HciCephObject.yaml +++ b/roles/HciCephObject.yaml @@ -46,7 +46,6 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt @@ -65,6 +64,5 @@ - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Tuned - - OS::TripleO::Services::Vpp - OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNMetadataAgent diff --git a/roles/Networker.yaml b/roles/Networker.yaml index e04861d3eb..504bd6b517 100644 --- a/roles/Networker.yaml +++ b/roles/Networker.yaml @@ -34,7 +34,6 @@ - OS::TripleO::Services::NeutronL3Agent - OS::TripleO::Services::NeutronMetadataAgent - OS::TripleO::Services::NeutronOvsAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::OctaviaDeploymentConfig - OS::TripleO::Services::OctaviaHealthManager diff --git a/roles/NetworkerSriov.yaml b/roles/NetworkerSriov.yaml index 4637ffbff4..e53e316489 100644 --- a/roles/NetworkerSriov.yaml +++ b/roles/NetworkerSriov.yaml @@ -35,7 +35,6 @@ - OS::TripleO::Services::NeutronL3Agent - OS::TripleO::Services::NeutronMetadataAgent - OS::TripleO::Services::NeutronOvsAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::OctaviaDeploymentConfig - OS::TripleO::Services::OctaviaHealthManager diff --git a/roles/README.rst b/roles/README.rst index 4285c51abb..319b35319b 100644 --- a/roles/README.rst +++ b/roles/README.rst @@ -171,7 +171,6 @@ Example * OS::TripleO::Services::Kernel * OS::TripleO::Services::MySQLClient * OS::TripleO::Services::NeutronSriovAgent - * OS::TripleO::Services::NeutronVppAgent * OS::TripleO::Services::NovaCompute * OS::TripleO::Services::NovaLibvirt * OS::TripleO::Services::NovaMigrationTarget @@ -183,7 +182,6 @@ Example * OS::TripleO::Services::Timezone * OS::TripleO::Services::TripleoFirewall * OS::TripleO::Services::TripleoPackages - * OS::TripleO::Services::Vpp name: 'Compute' Generate roles_data.yaml diff --git a/roles/Standalone.yaml b/roles/Standalone.yaml index 450eeec7a3..d880f27f44 100644 --- a/roles/Standalone.yaml +++ b/roles/Standalone.yaml @@ -136,7 +136,6 @@ - OS::TripleO::Services::NeutronMetadataAgent - OS::TripleO::Services::NeutronOvsAgent - OS::TripleO::Services::NeutronSfcApi - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NovaApi - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaConductor @@ -178,4 +177,3 @@ - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Unbound - OS::TripleO::Services::Tuned - - OS::TripleO::Services::Vpp diff --git a/roles_data.yaml b/roles_data.yaml index ed47fd4fba..fb461eb484 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -139,7 +139,6 @@ - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronMetadataAgent - OS::TripleO::Services::NeutronOvsAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NeutronAgentsIBConfig - OS::TripleO::Services::NovaApi - OS::TripleO::Services::NovaConductor @@ -178,7 +177,6 @@ - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Tuned - OS::TripleO::Services::Unbound - - OS::TripleO::Services::Vpp ############################################################################### # Role: Compute # ############################################################################### @@ -235,7 +233,6 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt @@ -254,7 +251,6 @@ - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Tuned - - OS::TripleO::Services::Vpp - OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNMetadataAgent ############################################################################### diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py index 1998f2d532..217aae1294 100755 --- a/tools/yaml-validate.py +++ b/tools/yaml-validate.py @@ -1212,8 +1212,6 @@ def validate(filename, param_map): 'OS::TripleO::Services::OVNController', 'OS::TripleO::Services::ComputeNeutronOvsAgent', 'OS::TripleO::Services::Tuned', - 'OS::TripleO::Services::NeutronVppAgent', - 'OS::TripleO::Services::Vpp', 'OS::TripleO::Services::NeutronLinuxbridgeAgent'] retval |= validate_with_compute_role_services(filename, tpl, exclude)