diff --git a/ci/environments/scenario000-standalone.yaml b/ci/environments/scenario000-standalone.yaml index cf0e6b5ccf..d237014d80 100644 --- a/ci/environments/scenario000-standalone.yaml +++ b/ci/environments/scenario000-standalone.yaml @@ -71,7 +71,6 @@ resource_registry: OS::TripleO::Services::IronicPxe: OS::Heat::None OS::TripleO::Services::Iscsid: OS::Heat::None # OS::TripleO::Services::Keystone: OS::Heat::None - OS::TripleO::Services::LiquidioCompute: OS::Heat::None OS::TripleO::Services::Logging::BarbicanApi: OS::Heat::None OS::TripleO::Services::Logging::GlanceApi: OS::Heat::None OS::TripleO::Services::Logging::HAProxy: OS::Heat::None diff --git a/deployment/deprecated/cavium/liquidio-compute-config-container-puppet.yaml b/deployment/deprecated/cavium/liquidio-compute-config-container-puppet.yaml deleted file mode 100644 index 87ee29662a..0000000000 --- a/deployment/deprecated/cavium/liquidio-compute-config-container-puppet.yaml +++ /dev/null @@ -1,124 +0,0 @@ -heat_template_version: wallaby - -description: > - OpenStack containerized Liquidio compute service -parameters: - ContainerLiquidioImage: - description: The container image to use for the Liquidio Service - type: string - ContainerLiquidioConfigImage: - description: The container image to use for the Liquidio config generation - type: string - 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 - RoleName: - default: '' - description: Role name on which the service is applied - type: string - RoleParameters: - default: {} - description: Parameters specific to the role - type: json - LiquidioSriovVfNum: - type: number - description: Number of vf interfaces to be created on Compute nodes - default: 4 - constraints: - - range: { min: 1, max: 64 } - description: Vfs should be between 1 and 64 - LiquidioConfigureMode: - type: string - description: Mode of installation, either odl, ovn or ovs - default: ml2-odl - constraints: - - allowed_values: [ 'ml2-odl', 'ml2-ovn', 'ml2-ovs' ] - description: ConfigureMode for Liquidio service - LiquidioEnableBonding: - type: boolean - description: DVR Enabled or not - default: true - LiquidioBondingOptions: - type: string - description: Bonding options for Liquido interfaces - default: active-backup - constraints: - - allowed_values: - - active-backup - - balance-tcp - - balance-slb - LiquidioProviderMappings: - type: string - description: BridgeMappings used in ODL/OVN Deployments - default: 'datacentre:eth1' - -resources: - - ContainersCommon: - type: ../containers-common.yaml - -outputs: - role_data: - description: Role data for Liquidio compute service. - value: - service_name: liquidio_compute_config - config_settings: - tripleo::host::liquidio::compute::vf_nums: {get_param: LiquidioSriovVfNum} - tripleo::host::liquidio::compute::configure_mode: {get_param: LiquidioConfigureMode} - tripleo::host::liquidio::compute::enable_bonding: {get_param: LiquidioEnableBonding} - tripleo::host::liquidio::compute::bonding_options: {get_param: LiquidioBondingOptions} - tripleo::host::liquidio::compute::provider_mappings: {get_param: LiquidioProviderMappings} - puppet_config: - config_volume: liquidio - puppet_tags: liquidio_config - step_config: | - include tripleo::host::liquidio::compute - config_image: {get_param: ContainerLiquidioConfigImage} - kolla_config: - /var/lib/kolla/config_files/liquidio_config.json: - command: "/usr/bin/liquidio-compute start" - config_files: - - source: "/var/lib/kolla/config_files/src/*" - dest: "/" - merge: true - preserve_properties: true - permissions: - - path: /var/log/liquidio/ - owner: root:root - recurse: true - docker_config: - step_5: - liquidio_compute_service: - start_order: 10 - image: {get_param: ContainerLiquidioImage} - net: host - detach: true - user: root - privileged: true - restart: always - volumes: - list_concat: - - {get_attr: [ContainersCommon, volumes]} - - - - /var/lib/kolla/config_files/liquidio_config.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/liquidio:/var/lib/kolla/config_files/src:ro - - /etc/udev/:/etc/udev/:z - - /usr/lib/udev/:/usr/lib/udev/:z - - /lib/modules/:/lib/modules/:z - - /usr/lib/firmware/liquidio/:/usr/lib/firmware/liquidio/:z - - /dev:/dev - - /run:/run - environment: - KOLLA_CONFIG_STRATEGY: COPY_ALWAYS diff --git a/environments/cavium-liquidio.yaml b/environments/cavium-liquidio.yaml deleted file mode 100644 index fbaa407e31..0000000000 --- a/environments/cavium-liquidio.yaml +++ /dev/null @@ -1,31 +0,0 @@ -resource_registry: - OS::TripleO::Services::LiquidioCompute: ../deployment/deprecated/cavium/liquidio-compute-config-container-puppet.yaml - -parameter_defaults: - LiquidioSriovVfNum: 4 - LiquidioConfigureMode: ml2-odl - LiquidioEnableBonding: true - LiquidioBondingOptions: active-backup - LiquidioProviderMappings: 'datacentre:eth1' - ComputeLiquidioParameters: - KernelArgs: "intel_iommu=on iommu=pt" - NovaOVSDBConnection: "tcp:127.0.0.1:6640" - #NovaSchedulerEnabledFilters: ['AvailabilityZoneFilter', 'ComputeFilter', 'ComputeCapabilitiesFilter', 'ImagePropertiesFilter', 'ServerGroupAntiAffinityFilter', 'ServerGroupAffinityFilter', 'PciPassthroughFilter'] - #NovaPCIPassthrough: - # - address: "*:02:00.*" - - #LiquidioConfigureMode takes three valid values - #ml2-odl:- Installation is OpenStack and Opendaylight - #ml2-ovn:- Installation is OpenStack and OVN - #ml2-ovs:- Standard Openstack with OVS - #LiquidioEnableBonding, if set to true then DVR on LiquidioCompute nodes - #is disabled by default. to Enable DVR on LiquidioCompute nodes, - #set it to false. - #Liquidio supports three bonding options, these are considered - #only when bonding is enabled - # 1) active-backup - # 2) balance-tcp - # 3) balance-slb - #LiquidioProviderMappings: Valid input : - #Interface is connected to external network and used only when bonding - #is disabled diff --git a/environments/undercloud/undercloud-minion.yaml b/environments/undercloud/undercloud-minion.yaml index fe66e6d8a3..608a4b1cf9 100644 --- a/environments/undercloud/undercloud-minion.yaml +++ b/environments/undercloud/undercloud-minion.yaml @@ -179,7 +179,6 @@ resource_registry: OS::TripleO::Services::IronicPxe: OS::Heat::None OS::TripleO::Services::Iscsid: OS::Heat::None OS::TripleO::Services::Keystone: OS::Heat::None - OS::TripleO::Services::LiquidioCompute: OS::Heat::None OS::TripleO::Services::Logging::BarbicanApi: OS::Heat::None OS::TripleO::Services::Logging::GlanceApi: OS::Heat::None OS::TripleO::Services::Logging::HAProxy: OS::Heat::None diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 722e57e363..90e83601e8 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -299,7 +299,6 @@ resource_registry: OS::TripleO::Services::OctaviaHousekeeping: OS::Heat::None OS::TripleO::Services::OctaviaWorker: OS::Heat::None OS::TripleO::Services::OctaviaDeploymentConfig: OS::Heat::None - OS::TripleO::Services::LiquidioCompute: 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 diff --git a/releasenotes/notes/remove-cavium-2d8cbe8a5085517a.yaml b/releasenotes/notes/remove-cavium-2d8cbe8a5085517a.yaml new file mode 100644 index 0000000000..710a9cb0c7 --- /dev/null +++ b/releasenotes/notes/remove-cavium-2d8cbe8a5085517a.yaml @@ -0,0 +1,11 @@ +--- +upgrade: + - | + Support for Cavium/Liquidio has been removed. + + - | + ```OS::TripleO::Services::LiquidioCompute``` has been removed and should + be removed from role data during upgrade. + + - | + The ```ComputeLiquidio``` role has been removed. diff --git a/roles/ComputeLiquidio.yaml b/roles/ComputeLiquidio.yaml deleted file mode 100644 index 3461fbbda2..0000000000 --- a/roles/ComputeLiquidio.yaml +++ /dev/null @@ -1,68 +0,0 @@ -############################################################################### -## Role: ComputeLiquidio # -################################################################################ -- name: ComputeLiquidio - description: | - Compute Node with Cavium Liquidio smart NIC - CountDefault: 1 - tags: - - compute - networks: - InternalApi: - subnet: internal_api_subnet - Tenant: - subnet: tenant_subnet - Storage: - subnet: storage_subnet - networks_skip_config: - - Tenant - HostnameFormatDefault: '%stackname%-lionovacompute-%index%' - RoleParametersDefault: - TunedProfileName: "virtual-host" - update_serial: 25 - ServicesDefault: - - OS::TripleO::Services::Aide - - OS::TripleO::Services::AuditD - - OS::TripleO::Services::BootParams - - OS::TripleO::Services::CACerts - - OS::TripleO::Services::CephClient - - OS::TripleO::Services::CephExternal - - OS::TripleO::Services::Collectd - - OS::TripleO::Services::ComputeCeilometerAgent - - OS::TripleO::Services::ComputeNeutronCorePlugin - - OS::TripleO::Services::ComputeNeutronL3Agent - - OS::TripleO::Services::ComputeNeutronMetadataAgent - - OS::TripleO::Services::ComputeNeutronOvsAgent - - OS::TripleO::Services::Frr - - OS::TripleO::Services::IpaClient - - OS::TripleO::Services::Ipsec - - OS::TripleO::Services::Iscsid - - OS::TripleO::Services::Kernel - - OS::TripleO::Services::LoginDefs - - OS::TripleO::Services::MetricsQdr - - OS::TripleO::Services::Multipathd - - 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 - - OS::TripleO::Services::NovaLibvirtGuests - - OS::TripleO::Services::NovaMigrationTarget - - OS::TripleO::Services::LiquidioCompute - - OS::TripleO::Services::ContainersLogrotateCrond - - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - - OS::TripleO::Services::Rhsm - - OS::TripleO::Services::Rsyslog - - OS::TripleO::Services::RsyslogSidecar - - OS::TripleO::Services::Securetty - - OS::TripleO::Services::Snmp - - OS::TripleO::Services::Sshd - - OS::TripleO::Services::Timesync - - OS::TripleO::Services::Timezone - - OS::TripleO::Services::TripleoFirewall - - OS::TripleO::Services::TripleoPackages - - OS::TripleO::Services::Tuned - - OS::TripleO::Services::Vpp diff --git a/sample-env-generator/undercloud-minion.yaml b/sample-env-generator/undercloud-minion.yaml index 37b539e595..fc51a8643f 100644 --- a/sample-env-generator/undercloud-minion.yaml +++ b/sample-env-generator/undercloud-minion.yaml @@ -165,7 +165,6 @@ environments: OS::TripleO::Services::IronicPxe: OS::Heat::None OS::TripleO::Services::Iscsid: OS::Heat::None OS::TripleO::Services::Keystone: OS::Heat::None - OS::TripleO::Services::LiquidioCompute: OS::Heat::None OS::TripleO::Services::Logging::BarbicanApi: OS::Heat::None OS::TripleO::Services::Logging::GlanceApi: OS::Heat::None OS::TripleO::Services::Logging::HAProxy: OS::Heat::None