Skip to content

Commit 7f1433c

Browse files
mburke5678mburke5678
authored
Merge pull request #29056 from mburke5678/okd-issue-198
Rename RHV to include/switch to oVirt
2 parents ae9b3a9 + 68c4f3b commit 7f1433c

File tree

5 files changed

+44
-4
lines changed

5 files changed

+44
-4
lines changed

‎installing/install_config/installation-types.adoc‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@ Not all installation options are supported for all platforms, as shown in the fo
1313

1414
.Installer-provisioned infrastructure options
1515
|===
16-
||AWS |Azure |GCP |OpenStack | RHV |Bare metal |vSphere |IBM Z |IBM Power
16+
ifndef::openshift-origin[]
17+
||AWS |Azure |GCP |OpenStack |RHV |Bare metal |vSphere |IBM Z |IBM Power
18+
endif::openshift-origin[]
19+
ifdef::openshift-origin[]
20+
||AWS |Azure |GCP |OpenStack |oVirt |Bare metal |vSphere |IBM Z |IBM Power
21+
endif::openshift-origin[]
1722

1823
|Default
1924
|xref:../../installing/installing_aws/installing-aws-default.adoc#installing-aws-default[X]
@@ -96,7 +101,12 @@ Not all installation options are supported for all platforms, as shown in the fo
96101

97102
.User-provisioned infrastructure options
98103
|===
99-
||AWS |Azure |GCP |OpenStack | RHV |Bare metal |vSphere |IBM Z |IBM Power
104+
ifndef::openshift-origin[]
105+
||AWS |Azure |GCP |OpenStack |RHV |Bare metal |vSphere |IBM Z |IBM Power
106+
endif::openshift-origin[]
107+
ifdef::openshift-origin[]
108+
||AWS |Azure |GCP |OpenStack |oVirt |Bare metal |vSphere |IBM Z |IBM Power
109+
endif::openshift-origin[]
100110

101111
|Custom
102112
|xref:../../installing/installing_aws/installing-aws-user-infra.adoc#installing-aws-user-infra[X]

‎installing/installing_rhv/installing-rhv-default.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[id="installing-rhv-default"]
2-
= Installing a cluster quickly on RHV
2+
= Installing a cluster quickly on {rh-virtualization}
33
include::modules/common-attributes.adoc[]
44
:context: installing-rhv-default
55

‎modules/installation-initializing.adoc‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,12 @@ ifdef::rhv[]
120120
====
121121
Due to a known issue with installing {product-title} versions 4.4 and 4.5 on {rh-virtualization-first} 4.4.1, you must customize `install-config.yaml` as described in link:https://access.redhat.com/solutions/5374251[Openshift IPI installation on {rh-virtualization}-4.x failed with "Error: timeout while waiting for state to become 'up' (last state: 'down', timeout: 10m0s)"]. This defect is fixed in {rh-virtualization} 4.4.2.
122122
====
123-
123+
ifndef::openshift-origin[]
124124
[WARNING]
125125
====
126126
Installing OpenShift Container Platform (OCP) version 4.6 on Red Hat Virtualization (RHV) requires RHV version 4.4. If you are running an earlier version of OCP on RHV 4.3, do not update it to OCP version 4.6. Red Hat has not tested running OCP version 4.6 on RHV version 4.3 and does not support this combination. Also see link:https://access.redhat.com/articles/4763741[{product-title} 4.x Tested Integrations (for x86_x64)].
127127
====
128+
endif::openshift-origin[]
128129
endif::rhv[]
129130
ifdef::vsphere[]
130131
VMware vSphere.
@@ -276,10 +277,20 @@ https://<engine-fqdn>/ovirt-engine/api <1>
276277
+
277278
For example:
278279
+
280+
ifndef::openshift-origin[]
279281
[source,terminal]
280282
----
283+
$ curl -k -u ovirtadmin@internal:pw123 \
281284
https://rhv-env.virtlab.example.com/ovirt-engine/api
282285
----
286+
endif::openshift-origin[]
287+
ifdef::openshift-origin[]
288+
[source,terminal]
289+
----
290+
$ curl -k -u ovirtadmin@internal:pw123 \
291+
https://ovirtlab.example.com/ovirt-engine/api
292+
----
293+
endif::openshift-origin[]
283294
+
284295
... For `Is the oVirt CA trusted locally?`, enter `Yes` since you have already set up a CA certificate. Otherwise, enter `No`.
285296
... For `oVirt's CA bundle`, if you entered `Yes` for the preceding question, copy the certificate content from `/etc/pki/ca-trust/source/anchors/ca.pem` and paste it here. Then, press `Enter` twice. Otherwise, if you entered `No` for the preceding question, this question does not appear.

‎modules/installation-launching-installer.adoc‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,10 +286,20 @@ https://<engine-fqdn>/ovirt-engine/api <1>
286286
+
287287
For example:
288288
+
289+
ifndef::openshift-origin[]
289290
[source,terminal]
290291
----
292+
$ curl -k -u ovirtadmin@internal:pw123 \
291293
https://rhv-env.virtlab.example.com/ovirt-engine/api
292294
----
295+
endif::openshift-origin[]
296+
ifdef::openshift-origin[]
297+
[source,terminal]
298+
----
299+
$ curl -k -u ovirtadmin@internal:pw123 \
300+
https://ovirtlab.example.com/ovirt-engine/api
301+
----
302+
endif::openshift-origin[]
293303
+
294304
.. For `Is the oVirt CA trusted locally?`, enter `Yes` since you have already set up a CA certificate. Otherwise, enter `No`.
295305
.. For `oVirt's CA bundle`, if you entered `Yes` for the preceding question, copy the certificate content from `/etc/pki/ca-trust/source/anchors/ca.pem` and paste it here. Then, press `Enter` twice. Otherwise, if you entered `No` for the preceding question, this question does not appear.

‎modules/installing-rhv-verifying-rhv-environment.adoc‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,17 @@ https://<engine-fqdn>/ovirt-engine/api <2>
5656
+
5757
For example:
5858
+
59+
ifndef::openshift-origin[]
5960
[source,terminal]
6061
----
6162
$ curl -k -u ovirtadmin@internal:pw123 \
6263
https://rhv-env.virtlab.example.com/ovirt-engine/api
6364
----
65+
endif::openshift-origin[]
66+
ifdef::openshift-origin[]
67+
[source,terminal]
68+
----
69+
$ curl -k -u ovirtadmin@internal:pw123 \
70+
https://ovirtlab.example.com/ovirt-engine/api
71+
----
72+
endif::openshift-origin[]

0 commit comments

Comments
 (0)