Skip to content

Commit 96a7961

Browse files
authored
Merge pull request #53971 from stevsmit/microshift-install-hide
hides the second installation for MicroShift because there is no cont…
2 parents 52267d3 + f30723c commit 96a7961

7 files changed

+34
-31
lines changed

_topic_maps/_topic_map_ms.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ Distros: microshift
5353
Topics:
5454
- Name: Installing from RPM
5555
File: microshift-install-rpm
56-
- Name: Installing in a RHEL for Edge Image
57-
File: microshift-install-rhel-for-edge
56+
#- Name: Installing in a RHEL for Edge Image
57+
# File: microshift-install-rhel-for-edge
5858
---
5959
Name: API reference
6060
Dir: microshift_rest_api

microshift_install/microshift-install-rpm.adoc

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,22 @@ include::_attributes/attributes-microshift.adoc[]
55
:context: microshift-install-rpm
66
toc::[]
77

8-
You can install MicroShift from an RPM package on a machine with {op-system-first} {op-system-version}.
8+
You can install {product-title} from an RPM package on a machine with {op-system-first} {op-system-version}.
99

10-
To embed MicroShift in a {op-system-ostree} image, see xref:../microshift_install/microshift-install-rhel-for-edge.adoc#microshift-install-rhel-for-edge[Embedding MicroShift into a {op-system-ostree-first} image].
10+
[IMPORTANT]
11+
====
12+
Red Hat will not provide or support an update or upgrade path from Developer Preview and Technology Preview versions to later versions of {product-title}. A new installation will be necessary.
13+
====
1114

12-
include::modules/system-requirements-installing-microshift.adoc[leveloffset=+2]
15+
include::modules/system-requirements-installing-microshift.adoc[leveloffset=+1]
1316

14-
include::modules/preparing-for-installing-microshift-rpm.adoc[leveloffset=+2]
17+
include::modules/preparing-for-installing-microshift-rpm.adoc[leveloffset=+1]
1518

16-
include::modules/installing-microshift-rpm.adoc[leveloffset=+2]
19+
include::modules/installing-microshift-rpm.adoc[leveloffset=+1]
1720

18-
include::modules/starting-microshift-service.adoc[leveloffset=+2]
21+
include::modules/starting-microshift-service.adoc[leveloffset=+1]
1922

20-
include::modules/stopping-microshift-service.adoc[leveloffset=+2]
23+
include::modules/stopping-microshift-service.adoc[leveloffset=+1]
2124

2225
include::modules/accessing-microshift.adoc[leveloffset=+1]
2326

modules/preparing-for-installing-microshift-rpm.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
// microshift/microshift-install-rpm.adoc
44

55
[id="preparing-install-microshift-from-rpm-package_{context}"]
6-
= Preparing to install MicroShift from an RPM package
6+
= Preparing to install {product-title} from an RPM package
77

8-
Before installing MicroShift from an RPM package, you must configure your {op-system} machine to have a logical volume manager (LVM) volume group (VG) with sufficient capacity for the persistent volumes (PVs) of your workload.
8+
Before installing {product-title} from an RPM package, you must configure your {op-system} machine to have a logical volume manager (LVM) volume group (VG) with sufficient capacity for the persistent volumes (PVs) of your workload.
99

10-
MicroShift uses the logical volume manager storage (LVMS) Container Storage Interface (CSI) provider for storing PVs. LVMS relies on Linux's LVM to dynamically manage the backing storage for PVs. For this reason, your machine must have an LVM VG in which LVMS can create the LVM logical volumes (LVs) for your workload's PVs.
10+
{product-title} uses the logical volume manager storage (LVMS) Container Storage Interface (CSI) provider for storing PVs. LVMS relies on Linux's LVM to dynamically manage the backing storage for PVs. For this reason, your machine must have an LVM VG in which LVMS can create the LVM logical volumes (LVs) for your workload's PVs.
1111

1212
To configure an LVM VG that allows LVMS to create the LVM LVs for your workload's PVs, adjust your root volume's size during the installation of {op-system}. Adjusting your root volume's size provides free space for additional LVs created by LVMS at runtime.
1313

modules/starting-microshift-service.adoc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,31 @@
44

55
:_content-type: PROCEDURE
66
[id="starting-microshift_service_{context}"]
7-
= Starting the MicroShift service
7+
= Starting the {product-title} service
88

9-
Use the following procedure to start the MicroShift service.
9+
Use the following procedure to start the {product-title} service.
1010

1111
.Prerequisites
1212

13-
* You have installed MicroShift from an RPM package.
13+
* You have installed {product-title} from an RPM package.
1414
1515
.Procedure
1616

17-
. As a root user, start the MicroShift service by entering the following command:
17+
. As a root user, start the {product-title} service by entering the following command:
1818
+
1919
[source,terminal]
2020
----
2121
$ sudo systemctl start microshift
2222
----
2323

24-
. Optional: To configure your {op-system} machine to start MicroShift when your machine starts, enter the following command:
24+
. Optional: To configure your {op-system} machine to start {product-title} when your machine starts, enter the following command:
2525
+
2626
[source,terminal]
2727
----
2828
$ sudo systemctl enable microshift
2929
----
3030

31-
. Optional: To disable MicroShift from automatically starting when your machine starts, enter the following command:
31+
. Optional: To disable {product-title} from automatically starting when your machine starts, enter the following command:
3232
+
3333
[source,terminal]
3434
----
@@ -37,6 +37,6 @@ $ sudo systemctl disable microshift
3737
+
3838
[NOTE]
3939
====
40-
The first time that the MicroShift service starts, it downloads and initializes MicroShift's container images. As a result, it can take several minutes for {product-title} to start the first time that the service is deployed.
41-
Boot time is reduced for subsequent starts of the MicroShift service.
40+
The first time that the {product-title} service starts, it downloads and initializes {product-title}'s container images. As a result, it can take several minutes for {product-title} to start the first time that the service is deployed.
41+
Boot time is reduced for subsequent starts of the {product-title} service.
4242
====

modules/stopping-microshift-service.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@
44

55
:_content-type: PROCEDURE
66
[id="stopping-microshift-service_{context}"]
7-
= Stopping the MicroShift service
7+
= Stopping the {product-title} service
88

9-
Use the following procedure to stop the MicroShift service.
9+
Use the following procedure to stop the {product-title} service.
1010

1111
.Prerequisites
1212

13-
* The MicroShift service is running.
13+
* The {product-title} service is running.
1414
1515
.Procedure
1616

17-
. Enter the following command to stop the MicroShift service:
17+
. Enter the following command to stop the {product-title} service:
1818
+
1919
[source,terminal]
2020
----
2121
$ sudo systemctl stop microshift
2222
----
2323

24-
. Workloads deployed on MicroShift will continue running even after the MicroShift service has been stopped. Enter the following command to display running workloads:
24+
. Workloads deployed on {product-title} will continue running even after the {product-title} service has been stopped. Enter the following command to display running workloads:
2525
+
2626
[source,terminal]
2727
----

modules/system-requirements-installing-microshift.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
// microshift/microshift-install-rpm.adoc
44

55
[id="system-requirements-installing-microshift"]
6-
== System requirements for installing MicroShift
6+
== System requirements for installing {product-title}
77

8-
The following conditions must be met prior to installing MicroShift:
8+
The following conditions must be met prior to installing {product-title}:
99

1010
* {op-system-first} {op-system-version}
1111
* 2 CPU cores
1212
* 2 GB of RAM
1313
* 10 GB of storage
1414
* 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.
15-
* You have a subscription that includes MicroShift RPMs.
15+
* You have a subscription that includes {product-title} RPMs.
1616
* You have a Logical Volume Manager (LVM) Volume Group (VG) with sufficient capacity for the Persistent Volumes (PVs) of your workload.
1717

18-
.MicroShift supported architectures
18+
.{product-title} supported architectures
1919
[options="header"]
2020
|===
2121
|Architecture |String
@@ -31,7 +31,7 @@ The following conditions must be met prior to installing MicroShift:
3131
|===
3232

3333

34-
.MicroShift supported operating systems
34+
.{product-title} supported operating systems
3535
[options="header"]
3636
|===
3737
|Operating system |String

welcome/index.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Start with **xref:../architecture/architecture.adoc#architecture-overview-archit
5656
endif::[]
5757

5858
ifdef::microshift[]
59-
Start with xref:../microshift_getting_started/microshift-understanding.adoc#microshift-understanding[Understanding {product-title}] and xref:../microshift_install/microshift-install-rhel-for-edge.adoc#microshift-install-rhel-for-edge[Installing].
59+
Start with xref:../microshift_getting_started/microshift-understanding.adoc#microshift-understanding[Understanding {product-title}] and xref:../microshift_install/microshift-install-rpm.adoc#microshift-install-rpm[Installing].
6060
Then, see the xref:../microshift_release_notes/microshift-4-12-release-notes.adoc#microshift-4-12-release-notes[release notes].
6161

6262
[IMPORTANT]

0 commit comments

Comments
 (0)