Skip to content

Commit 4cd91a1

Browse files
abrennan89abrennan89
authored
Merge pull request #111930 from abrennan89/fix-about-virt-cqa
DOCPLAN-368: Fix CQA 2.0 violations in about-virt.adoc
2 parents 1867f7d + 8c24278 commit 4cd91a1

2 files changed

Lines changed: 20 additions & 26 deletions

File tree

‎modules/virt-what-you-can-do-with-virt.adoc‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ You can manage your cluster and virtualization resources by using the *Virtualiz
3737
3838
[IMPORTANT]
3939
====
40-
For supported and unsupported OVN-Kubernetes network plugin use cases, see "OVN-Kubernetes purpose".
40+
For supported and unsupported OVN-Kubernetes network plug-in use cases, see "OVN-Kubernetes purpose".
4141
====
4242
4343
ifndef::openshift-rosa,openshift-dedicated,openshift-rosa-hcp[]
@@ -49,5 +49,21 @@ When you deploy {VirtProductName} with {rh-storage}, you must create a dedicated
4949
====
5050
endif::openshift-rosa,openshift-dedicated,openshift-rosa-hcp[]
5151
52-
// A line about support for OVN and OpenShiftSDN network providers has been moved to the `about-virt` assembly due to xrefs.
53-
// If you are re-using this module, you might also want to include that line in your assembly.
52+
You can use {VirtProductName} with OVN-Kubernetes or one of the other certified network plug-ins listed in "Certified OpenShift CNI Plug-ins".
53+
54+
ifdef::openshift-rosa,openshift-dedicated,openshift-rosa-hcp[]
55+
You can use {VirtProductName} with OVN-Kubernetes.
56+
endif::openshift-rosa,openshift-dedicated,openshift-rosa-hcp[]
57+
58+
// Hiding links in ROSA/OSD until PR 62384 merges
59+
ifndef::openshift-rosa,openshift-dedicated,openshift-rosa-hcp[]
60+
You can check your {VirtProductName} cluster for compliance issues by installing the Compliance Operator and running a scan with the `ocp4-moderate` and `ocp4-moderate-node` profiles. The Compliance Operator uses OpenSCAP, a NIST-certified tool, to scan and enforce security policies.
61+
endif::openshift-rosa,openshift-dedicated,openshift-rosa-hcp[]
62+
63+
ifdef::openshift-rosa,openshift-dedicated,openshift-rosa-hcp[]
64+
You can check your {VirtProductName} cluster for compliance issues by installing the Compliance Operator and running a scan with the `ocp4-moderate` and `ocp4-moderate-node` profiles. The Compliance Operator uses OpenSCAP, a NIST-certified tool, to scan and enforce security policies.
65+
endif::openshift-rosa,openshift-dedicated,openshift-rosa-hcp[]
66+
67+
ifndef::openshift-dedicated[]
68+
For information about partnering with Independent Software Vendors (ISVs) and Services partners for specialized storage, networking, backup, and additional functionality, see the Red Hat Ecosystem Catalog.
69+
endif::openshift-dedicated[]

‎virt/about_virt/about-virt.adoc‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,6 @@ toc::[]
1111

1212
include::modules/virt-what-you-can-do-with-virt.adoc[leveloffset=+1]
1313

14-
// This line is attached to the above `virt-what-you-can-do-with-virt` module.
15-
// It is included here in the assembly because of the xref ban.
16-
17-
You can use {VirtProductName} with OVN-Kubernetes or one of the other certified network plugins listed in Certified OpenShift CNI Plug-ins.
18-
19-
ifdef::openshift-rosa,openshift-dedicated,openshift-rosa-hcp[]
20-
You can use {VirtProductName} with OVN-Kubernetes.
21-
endif::openshift-rosa,openshift-dedicated,openshift-rosa-hcp[]
22-
23-
// Hiding links in ROSA/OSD until PR 62384 merges
24-
ifndef::openshift-rosa,openshift-dedicated,openshift-rosa-hcp[]
25-
You can check your {VirtProductName} cluster for compliance issues by installing the Compliance Operator and running a scan with the `ocp4-moderate` and `ocp4-moderate-node` profiles. The Compliance Operator uses OpenSCAP, a NIST-certified tool, to scan and enforce security policies.
26-
endif::openshift-rosa,openshift-dedicated,openshift-rosa-hcp[]
27-
28-
ifdef::openshift-rosa,openshift-dedicated,openshift-rosa-hcp[]
29-
You can check your {VirtProductName} cluster for compliance issues by installing the Compliance Operator and running a scan with the `ocp4-moderate` and `ocp4-moderate-node` profiles. The Compliance Operator uses OpenSCAP, a NIST-certified tool, to scan and enforce security policies.
30-
endif::openshift-rosa,openshift-dedicated,openshift-rosa-hcp[]
31-
32-
ifndef::openshift-dedicated[]
33-
For information about partnering with Independent Software Vendors (ISVs) and Services partners for specialized storage, networking, backup, and additional functionality, see the Red Hat Ecosystem Catalog.
34-
endif::openshift-dedicated[]
35-
3614
include::modules/virt-vmware-comparison.adoc[leveloffset=+1]
3715

3816
include::modules/virt-supported-cluster-version.adoc[leveloffset=+1]
@@ -59,7 +37,7 @@ endif::openshift-rosa,openshift-dedicated,openshift-rosa-hcp[]
5937
ifndef::openshift-rosa,openshift-dedicated,openshift-rosa-hcp[]
6038
* xref:../../installing/installing_sno/install-sno-preparing-to-install-sno.adoc#install-sno-about-installing-on-a-single-node_install-sno-preparing[About {sno}]
6139
endif::openshift-rosa,openshift-dedicated,openshift-rosa-hcp[]
62-
* link:https://cloud.redhat.com/blog/using-the-openshift-assisted-installer-service-to-deploy-an-openshift-cluster-on-metal-and-vsphere[Assisted installer]
40+
* link:https://cloud.redhat.com/blog/using-the-openshift-assisted-installer-service-to-deploy-an-openshift-cluster-on-metal-and-vsphere[Using the OpenShift Assisted Installer Service to Deploy an OpenShift Cluster on Bare Metal and vSphere]
6341
* link:https://access.redhat.com/articles/5436171[Certified OpenShift CNI Plug-ins]
6442
* link:https://www.nist.gov/[NIST-certified tool]
6543
* link:https://red.ht/workswithvirt[Red Hat Ecosystem Catalog]

0 commit comments

Comments
 (0)