Skip to content

Commit 023f0c2

Browse files
authored
Merge pull request #81888 from maxwelldb/shiftstack-etcd-ephemperal-ocpbugs39132
[OCPBUGS#39132] Revise ShiftStack rootVolume and etcd local docs CPMS update step
2 parents 5324ee5 + 527669c commit 023f0c2

File tree

1 file changed

+0
-86
lines changed

1 file changed

+0
-86
lines changed

modules/installation-osp-local-disk-deployment.adoc

Lines changed: 0 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -69,92 +69,6 @@ $ oc wait clusteroperators --all --for=condition=Progressing=false <1>
6969
+
7070
<1> Ensures that the cluster operators are finished progressing and that the cluster is not deploying or updating.
7171

72-
. Edit the `ControlPlaneMachineSet` (CPMS) to add the additional block ephemeral device that is used by etcd by running the following command:
73-
+
74-
[%collapsible]
75-
====
76-
[source,terminal]
77-
----
78-
$ oc patch ControlPlaneMachineSet/cluster -n openshift-machine-api --type json -p ' <1>
79-
[
80-
{
81-
"op": "add",
82-
"path": "/spec/template/machines_v1beta1_machine_openshift_io/spec/providerSpec/value/additionalBlockDevices", <2>
83-
"value": [
84-
{
85-
"name": "etcd",
86-
"sizeGiB": 10,
87-
"storage": {
88-
"type": "Local" <3>
89-
}
90-
}
91-
]
92-
}
93-
]
94-
'
95-
----
96-
<1> Applies the JSON patch to the `ControlPlaneMachineSet` custom resource (CR).
97-
<2> Specifies the path where the `additionalBlockDevices` are added.
98-
<3> Adds the etcd devices with at least local storage of 10 GB to the cluster. You can specify values greater than 10 GB as long as the etcd device fits the Nova flavor. For example, if the Nova flavor has 15 GB, you can create the etcd device with 12 GB.
99-
====
100-
101-
. Verify that the control plane machines are healthy by using the following steps:
102-
103-
.. Wait for the control plane machine set update to finish by running the following command:
104-
105-
+
106-
[source,terminal]
107-
----
108-
$ oc wait --timeout=90m --for=condition=Progressing=false controlplanemachineset.machine.openshift.io -n openshift-machine-api cluster
109-
----
110-
111-
.. Verify that the 3 control plane machine sets are updated by running the following command:
112-
113-
+
114-
[source,terminal]
115-
----
116-
$ oc wait --timeout=90m --for=jsonpath='{.status.updatedReplicas}'=3 controlplanemachineset.machine.openshift.io -n openshift-machine-api cluster
117-
----
118-
119-
.. Verify that the 3 control plane machine sets are healthy by running the following command:
120-
121-
+
122-
[source,terminal]
123-
----
124-
$ oc wait --timeout=90m --for=jsonpath='{.status.replicas}'=3 controlplanemachineset.machine.openshift.io -n openshift-machine-api cluster
125-
----
126-
127-
.. Verify that the `ClusterOperators` are not progressing in the cluster by running the following command:
128-
129-
+
130-
[source,terminal]
131-
----
132-
$ oc wait clusteroperators --timeout=30m --all --for=condition=Progressing=false
133-
----
134-
135-
.. Verify that each of the 3 control plane machines has the additional block device you previously created by running the following script:
136-
137-
+
138-
[source,bash]
139-
----
140-
$ cp_machines=$(oc get machines -n openshift-machine-api --selector='machine.openshift.io/cluster-api-machine-role=master' --no-headers -o custom-columns=NAME:.metadata.name) //<1>
141-
142-
143-
if [[ $(echo "${cp_machines}" | wc -l) -ne 3 ]]; then
144-
exit 1
145-
fi //<2>
146-
147-
148-
for machine in ${cp_machines}; do
149-
if ! oc get machine -n openshift-machine-api "${machine}" -o jsonpath='{.spec.providerSpec.value.additionalBlockDevices}' | grep -q 'etcd'; then
150-
exit 1
151-
fi //<3>
152-
done
153-
----
154-
<1> Retrieves the control plane machines running in the cluster.
155-
<2> Iterates over machines which have an `additionalBlockDevices` entry with the name `etcd`.
156-
<3> Outputs the name of every control plane machine which has an `additionalBlockDevice` named `etcd`.
157-
15872
. Create a file named `98-var-lib-etcd.yaml` by using the following YAML file:
15973
+
16074
[WARNING]

0 commit comments

Comments
 (0)