Merge pull request #39019 from mburke5678/GH#38932

GH#38932: OKD - insecure ovirt config file is invalid

Author: mburke5678

modules/installation-initializing.adoc

@@ -346,7 +346,7 @@ endif::openshift-origin[]
 ifdef::openshift-origin[]
 [source,terminal]
 ----
-$ curl -k -u ocpadmin@internal:pw123 \
+$ curl -k -u admin@internal:pw123 \
 https://ovirtlab.example.com/ovirt-engine/api
 ----
 endif::openshift-origin[]
@@ -362,10 +362,18 @@ endif::openshift-origin[]
 ----
 <1> For `<username>`, specify the user name of an {rh-virtualization} administrator. For `<profile>`, specify the login profile, which you can get by going to the {rh-virtualization} Administration Portal login page and reviewing the *Profile* dropdown list. Together, the user name and profile should look similar to this example:
 +
+ifndef::openshift-origin[]
 [source,terminal]
 ----
 ocpadmin@internal
 ----
+endif::openshift-origin[]
+ifdef::openshift-origin[]
+[source,terminal]
+----
+admin@internal
+----
+endif::openshift-origin[]
 +
 ... For `oVirt engine password`, enter the {rh-virtualization} admin password.
 ... For `oVirt cluster`, select the cluster for installing {product-title}.

modules/installation-launching-installer.adoc

@@ -363,7 +363,7 @@ endif::openshift-origin[]
 ifdef::openshift-origin[]
 [source,terminal]
 ----
-$ curl -k -u ocpadmin@internal:pw123 \
+$ curl -k -u admin@internal:pw123 \
 https://ovirtlab.example.com/ovirt-engine/api
 ----
 endif::openshift-origin[]

modules/installation-rhv-creating-install-config-file.adoc

@@ -30,6 +30,7 @@ $ openshift-install create install-config --dir $ASSETS_DIR
 
 . Respond to the installation program's prompts with information about your system.
 +
+ifndef::openshift-origin[]
 .Example output
 [source,terminal]
 ----
@@ -47,6 +48,26 @@ $ openshift-install create install-config --dir $ASSETS_DIR
 ? Cluster Name <ocp4>
 ? Pull Secret [? for help] <********>
 ----
+endif::openshift-origin[]
+ifndef::openshift-origin[]
+.Example output
+[source,terminal]
+----
+? SSH Public Key /home/user/.ssh/id_dsa.pub
+? Platform <ovirt>
+? Engine FQDN[:PORT] [? for help] <engine.fqdn>
+? Enter ovirt-engine username <ocpadmin@internal>
+? Enter password <******>
+? oVirt cluster <cluster>
+? oVirt storage <storage>
+? oVirt network <net>
+? Internal API virtual IP <172.16.0.252>
+? Ingress virtual IP <172.16.0.251>
+? Base Domain <example.org>
+? Cluster Name <ocp4>
+? Pull Secret [? for help] <********>
+----
+endif::openshift-origin[]
 
 For `Internal API virtual IP` and `Ingress virtual IP`, supply the IP addresses you specified when you configured the DNS service.
 

modules/installing-rhv-insecure-mode.adoc

@@ -23,6 +23,18 @@ Installing in *insecure* mode is not recommended, because it enables a potential
 
 . Add the following content to `ovirt-config.yaml`:
 +
+ifndef::openshift-origin[]
+[source,terminal]
+----
+ovirt_url: https://ovirt.example.com/ovirt-engine/api <1>
+ovirt_fqdn: ovirt.example.com <2>
+ovirt_pem_url: ""
+ovirt_username: ocpadmin@internal
+ovirt_password: super-secret-password <3>
+ovirt_insecure: true
+----
+endif::openshift-origin[]
+ifdef::openshift-origin[]
 [source,terminal]
 ----
 ovirt_url: https://ovirt.example.com/ovirt-engine/api <1>
@@ -32,6 +44,7 @@ ovirt_username: admin@internal
 ovirt_password: super-secret-password <3>
 ovirt_insecure: true
 ----
+endif::openshift-origin[]
 <1> Specify the hostname or address of your oVirt engine.
 <2> Specify the fully qualified domain name of your oVirt engine.
 <3> Specify the admin password for your oVirt engine.

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

@@ -69,7 +69,7 @@ endif::openshift-origin[]
 ifdef::openshift-origin[]
 [source,terminal]
 ----
-$ curl -k -u ocpadmin@internal:pw123 \
+$ curl -k -u admin@internal:pw123 \
 https://ovirtlab.example.com/ovirt-engine/api
 ----
 endif::openshift-origin[]