Skip to content

Commit 090c1bf

Browse files
committed
BZ1849398 - Change ovirtadmin@internal and admin@internal to ocpadmin@internal
1 parent e2cef18 commit 090c1bf

7 files changed

+20
-20
lines changed

modules/installation-initializing.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,14 +298,14 @@ For example:
298298
ifndef::openshift-origin[]
299299
[source,terminal]
300300
----
301-
$ curl -k -u ovirtadmin@internal:pw123 \
301+
$ curl -k -u ocpadmin@internal:pw123 \
302302
https://rhv-env.virtlab.example.com/ovirt-engine/api
303303
----
304304
endif::openshift-origin[]
305305
ifdef::openshift-origin[]
306306
[source,terminal]
307307
----
308-
$ curl -k -u ovirtadmin@internal:pw123 \
308+
$ curl -k -u ocpadmin@internal:pw123 \
309309
https://ovirtlab.example.com/ovirt-engine/api
310310
----
311311
endif::openshift-origin[]
@@ -322,7 +322,7 @@ endif::openshift-origin[]
322322
+
323323
[source,terminal]
324324
----
325-
admin@internal
325+
ocpadmin@internal
326326
----
327327
+
328328
... For `oVirt engine password`, enter the {rh-virtualization} admin password.

modules/installation-launching-installer.adoc

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -291,9 +291,9 @@ link:https://cloud.redhat.com/openshift/install/pull-secret[Pull Secret] page on
291291
endif::openshift-origin[]
292292
ifdef::openshift-origin[]
293293
.. Paste the pull secret that you obtained from the
294-
link:https://cloud.redhat.com/openshift/install/pull-secret[Pull Secret] page on the {cloud-redhat-com} site.
295-
* If you do not have a pull secret from the {cloud-redhat-com} site, you can paste the pull secret another private registry.
296-
* If you do not need the cluster to pull images from a private registry, you can paste `{"auths":{"fake":{"auth":"aWQ6cGFzcwo="}}}` as the pull secret.
294+
link:https://cloud.redhat.com/openshift/install/pull-secret[Pull Secret] page on the {cloud-redhat-com} site.
295+
* If you do not have a pull secret from the {cloud-redhat-com} site, you can paste the pull secret another private registry.
296+
* If you do not need the cluster to pull images from a private registry, you can paste `{"auths":{"fake":{"auth":"aWQ6cGFzcwo="}}}` as the pull secret.
297297
endif::openshift-origin[]
298298
endif::rhv[]
299299
ifdef::rhv[]
@@ -320,14 +320,14 @@ For example:
320320
ifndef::openshift-origin[]
321321
[source,terminal]
322322
----
323-
$ curl -k -u ovirtadmin@internal:pw123 \
323+
$ curl -k -u ocpadmin@internal:pw123 \
324324
https://rhv-env.virtlab.example.com/ovirt-engine/api
325325
----
326326
endif::openshift-origin[]
327327
ifdef::openshift-origin[]
328328
[source,terminal]
329329
----
330-
$ curl -k -u ovirtadmin@internal:pw123 \
330+
$ curl -k -u ocpadmin@internal:pw123 \
331331
https://ovirtlab.example.com/ovirt-engine/api
332332
----
333333
endif::openshift-origin[]
@@ -345,7 +345,7 @@ endif::openshift-origin[]
345345
+
346346
[source,terminal]
347347
----
348-
admin@internal
348+
ocpadmin@internal
349349
----
350350
+
351351
.. For `oVirt engine password`, enter the {rh-virtualization} admin password.
@@ -384,10 +384,10 @@ display in your terminal.
384384
[source,terminal]
385385
----
386386
...
387-
INFO Install complete!
388-
INFO To access the cluster as the system:admin user when using 'oc', run 'export KUBECONFIG=/home/myuser/install_dir/auth/kubeconfig'
389-
INFO Access the OpenShift web-console here: https://console-openshift-console.apps.mycluster.example.com
390-
INFO Login to the console with user: "kubeadmin", and password: "4vYBz-Ee6gm-ymBZj-Wt5AL"
387+
INFO Install complete!
388+
INFO To access the cluster as the system:admin user when using 'oc', run 'export KUBECONFIG=/home/myuser/install_dir/auth/kubeconfig'
389+
INFO Access the OpenShift web-console here: https://console-openshift-console.apps.mycluster.example.com
390+
INFO Login to the console with user: "kubeadmin", and password: "4vYBz-Ee6gm-ymBZj-Wt5AL"
391391
INFO Time elapsed: 36m22s
392392
----
393393
+

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ $ openshift-install create install-config --dir $ASSETS_DIR
3535
? SSH Public Key /home/user/.ssh/id_dsa.pub
3636
? Platform <ovirt>
3737
? Engine FQDN[:PORT] [? for help] <engine.fqdn>
38-
? Enter ovirt-engine username <ovirtadmin@internal>
38+
? Enter ovirt-engine username <ocpadmin@internal>
3939
? Enter password <******>
4040
? oVirt cluster <cluster>
4141
? oVirt storage <storage>

modules/installing-rhv-insecure-mode.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Installing in *insecure* mode is not recommended, because it enables a potential
2727
ovirt_url: \https://ovirt.example.com/ovirt-engine/api
2828
ovirt_fqdn: ovirt.example.com
2929
ovirt_pem_url: ""
30-
ovirt_username: admin@internal
30+
ovirt_username: ocpadmin@internal
3131
ovirt_password: super-secret-password
3232
ovirt_insecure: true
3333
----

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ For example:
6161
ifndef::openshift-origin[]
6262
[source,terminal]
6363
----
64-
$ curl -k -u ovirtadmin@internal:pw123 \
64+
$ curl -k -u ocpadmin@internal:pw123 \
6565
https://rhv-env.virtlab.example.com/ovirt-engine/api
6666
----
6767
endif::openshift-origin[]
6868
ifdef::openshift-origin[]
6969
[source,terminal]
7070
----
71-
$ curl -k -u ovirtadmin@internal:pw123 \
71+
$ curl -k -u ocpadmin@internal:pw123 \
7272
https://ovirtlab.example.com/ovirt-engine/api
7373
----
7474
endif::openshift-origin[]

modules/virt-importing-vm-cli.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ type: Opaque
3030
stringData:
3131
ovirt: |
3232
apiUrl: <api_endpoint> <2>
33-
username: admin@internal
33+
username: ocpadmin@internal
3434
password: <3>
3535
caCert: |
3636
-----BEGIN CERTIFICATE-----
@@ -40,7 +40,7 @@ EOF
4040
----
4141
<1> Optional. You can specify a different namespace in all the CRs.
4242
<2> Specify the API endpoint of the RHV Manager, for example, `\"https://www.example.com:8443/ovirt-engine/api"`
43-
<3> Specify the password for `admin@internal`.
43+
<3> Specify the password for `ocpadmin@internal`.
4444
<4> Specify the RHV Manager CA certificate. You can obtain the CA certificate by running the following command:
4545
+
4646
[source,terminal]

modules/virt-importing-vm-wizard.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ $ openssl s_client -connect <RHV_Manager_FQDN>:443 -showcerts < /dev/null
7575
+
7676
The CA certificate is the second certificate in the output.
7777

78-
** *Username*: RHV Manager user name, for example, `admin@internal`
78+
** *Username*: RHV Manager user name, for example, `ocpadmin@internal`
7979
** *Password*: RHV Manager password
8080

8181
* If you select a saved RHV instance, the wizard connects to the RHV instance using the saved credentials.

0 commit comments

Comments
 (0)