Merge pull request #67226 from openshift/revert-67161-attributes-addl-clouds

Revert "adds/organizes several cloud provider name attributes"

Author: jeana-redhat

_attributes/common-attributes.adoc

@@ -92,6 +92,8 @@ endif::[]
 :pac: Pipelines as Code
 //odo
 :odo-title: odo
+//alibaba cloud
+:alibaba: Alibaba Cloud
 //OpenShift Kubernetes Engine
 :oke: OpenShift Kubernetes Engine
 //OpenShift Platform Plus
@@ -149,6 +151,14 @@ endif::[]
 :SMProductVersion1x: 1.1.18.2
 //Windows containers
 :productwinc: Red Hat OpenShift support for Windows Containers
+// IBM Cloud
+:ibmcloudBMProductName: IBM Cloud Bare Metal (Classic)
+:ibmcloudBMRegProductName: IBM Cloud® Bare Metal (Classic)
+// IBM Power
+:ibmpowerProductName: IBM Power
+// IBM zSystems
+:ibmzProductName: IBM Z
+:linuxoneProductName: IBM(R) LinuxONE
 // Red Hat Quay Container Security Operator
 :rhq-cso: Red Hat Quay Container Security Operator
 // Red Hat Quay
@@ -185,42 +195,13 @@ endif::[]
 :3no: three-node OpenShift
 :3no-caps: Three-node OpenShift
 :run-once-operator: Run Once Duration Override Operator
+//Oracle
+:oci-first: Oracle® Cloud Infrastructure
+:oci: OCI
+:ocvs-first: Oracle® Cloud VMware Solution (OCVS)
+:ocvs: OCVS
 // Web terminal
 :web-terminal-op: Web Terminal Operator
 :devworkspace-op: DevWorkspace Operator
 :secrets-store-driver: Secrets Store CSI driver
 :secrets-store-operator: Secrets Store CSI Driver Operator
-//AWS STS
-:sts-first: Security Token Service (STS)
-:sts-full: Security Token Service
-:sts: STS
-//Cloud provider names
-//AWS
-:aws-first: Amazon Web Services (AWS)
-:aws-full: Amazon Web Services
-:aws: AWS
-//GCP
-:gcp-first: Google Cloud Platform (GCP)
-:gcp-full: Google Cloud Platform
-:gcp: GCP
-//alibaba cloud
-:alibaba: Alibaba Cloud
-// IBM Cloud
-:ibmcloudBMProductName: IBM Cloud Bare Metal (Classic)
-:ibmcloudBMRegProductName: IBM Cloud® Bare Metal (Classic)
-// IBM Power
-:ibmpowerProductName: IBM Power
-// IBM zSystems
-:ibmzProductName: IBM Z
-:linuxoneProductName: IBM(R) LinuxONE
-//Azure
-:azure-full: Microsoft Azure
-:azure: Azure
-//vSphere
-:vmw-full: VMware vSphere
-:vmw: vSphere
-//Oracle
-:oci-first: Oracle® Cloud Infrastructure
-:oci: OCI
-:ocvs-first: Oracle® Cloud VMware Solution (OCVS)
-:ocvs: OCVS