Skip to content

Commit 1c54be6

Browse files
authored
Merge pull request #55431 from ShaunaDiaz/OSDOCS-5131
OSDOCS-5131: arches and dev preview nit change
2 parents 808b525 + 676dacd commit 1c54be6

5 files changed

+7
-27
lines changed

microshift_install/microshift-install-rpm.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ You can install {product-title} from an RPM package on a machine with {op-system
1010

1111
[IMPORTANT]
1212
====
13-
Red Hat does not support an update path from Developer Preview and Technology Preview versions to later versions of {product-title}. A new installation will be necessary.
13+
Red Hat does not support an update path from Developer Preview and Technology Preview versions to later versions of {product-title}. A new installation is necessary.
1414
====
1515

1616
include::modules/microshift-install-system-requirements.adoc[leveloffset=+1]

modules/microshift-accessing-cluster-remotely-non-admin.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ Use the following procedure to access the {product-title} cluster from a remote
2020

2121
. As `user@workstation`, create a `~/.kube/` folder if your {op-system} machine does not have one by running the following command:
2222
+
23-
[source,terminal]
23+
[source,terminal,subs="attributes+"]
2424
----
2525
[user@workstation]$ mkdir -p ~/.kube/
2626
----
2727

2828
. As `user@workstation`, set a variable for the hostname of your {product-title} host by running the following command:
2929
+
30-
[source,terminal]
30+
[source,terminal,subs="attributes+"]
3131
----
3232
[user@microshift]$ MICROSHIFT_MACHINE=<name or IP address of {product-title} machine>
3333
----

modules/microshift-adding-repos-to-image-builder.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Use the following procedure to add the {product-title} repositories to Image Bui
2020
[source,terminal,subs="attributes+"]
2121
----
2222
$ sudo subscription-manager repos
23-
--enable rhocp-{ocp-version}-for-rhel-{op-system-version-major}-$(uname -i)-rpms
23+
--enable rhocp-{product-version}-for-rhel-{op-system-version-major}-$(uname -i)-rpms
2424
--enable fast-datapath-for-rhel-{op-system-version-major}-$(uname -i)-rpms
2525
----
2626

@@ -37,7 +37,7 @@ $ sudo yum install -y yum-utils
3737
----
3838
$ sudo reposync --arch=$(uname -i) --arch=noarch --gpgcheck \
3939
--download-path REPO_PATH=/var/repos/microshift-local \
40-
--repo=rhocp-{ocp-version}-for-rhel-{op-system-version-major}-$(uname -i)-rpms \
40+
--repo=rhocp-{product-version}-for-rhel-{op-system-version-major}-$(uname -i)-rpms \
4141
--repo=fast-datapath-for-rhel-{op-system-version-major}-$(uname -i)-rpms
4242
----
4343

modules/microshift-install-system-requirements.adoc

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
[id="system-requirements-installing-microshift"]
66
= System requirements for installing {product-title}
77

8+
{product-title} supports a 64-bit version of the x86 architecture and the {op-system-first} {op-system-version} operating system.
9+
810
The following conditions must be met prior to installing {product-title}:
911

1012
* {op-system-first} {op-system-version}
@@ -14,24 +16,3 @@ The following conditions must be met prior to installing {product-title}:
1416
* You have an active {product-title} subscription on your Red Hat account. If you do not have a subscription, contact your sales representative for more information.
1517
* You have a subscription that includes {product-title} RPMs.
1618
* You have a Logical Volume Manager (LVM) Volume Group (VG) with sufficient capacity for the Persistent Volumes (PVs) of your workload.
17-
18-
.{product-title} supported architectures
19-
[options="header"]
20-
|===
21-
|Architecture |String
22-
23-
|AMD64
24-
|`amd64`
25-
26-
|Intel
27-
|`x86_64`
28-
|===
29-
30-
.{product-title} supported operating systems
31-
[options="header"]
32-
|===
33-
|Operating system |String
34-
35-
|{op-system-first} {op-system-version}
36-
|`linux`
37-
|===

modules/microshift-ovs-snapshot.adoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ $ sudo ovs-vsctl show
5050
type: internal
5151
ovs_version: "2.17.3"
5252
----
53-
5453
<1> The `patch-br-ex_localhost.localdomain-to-br-int` and `patch-br-int-to-br-ex_localhost.localdomain` are OVS patch ports that connect `br-ex` and `br-int`.
5554
<2> The pod interfaces `eebee1ce5568761`, `b47b1995ada84f4` and `3031f43d67c167f` are named with the first 15 bits of pod sandbox ID and are plugged in the `br-int` bridge.
5655
<3> The OVS internal port for hairpin traffic,`ovn-k8s-mp0` is created by the `ovnkube-master` container.

0 commit comments

Comments
 (0)