From 4cf391c6dd8d2d4807f43fe078ba2cc54bb3cbf1 Mon Sep 17 00:00:00 2001 From: Max Bridges Date: Fri, 22 Sep 2023 13:41:53 -0400 Subject: [PATCH] Adjust node migration docs for ShiftStack re: CPMS - OSDOCS-7261 --- modules/cpmso-feat-replace.adoc | 11 +++++++++++ ...ion-user-infra-generate-k8s-manifest-ignition.adoc | 4 ++-- modules/nodes-control-plane-osp-migrating.adoc | 11 +++++++++-- nodes/nodes/nodes-nodes-managing.adoc | 4 ++++ 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/modules/cpmso-feat-replace.adoc b/modules/cpmso-feat-replace.adoc index d1344c50cf..bb332c630a 100644 --- a/modules/cpmso-feat-replace.adoc +++ b/modules/cpmso-feat-replace.adoc @@ -8,6 +8,17 @@ To replace a control plane machine in a cluster that has a control plane machine set, you delete the machine manually. The control plane machine set replaces the deleted machine with one using the specification in the control plane machine set custom resource (CR). +.Prerequisites + +* If your cluster runs on {rh-openstack-first} and you need to evacuate a compute server, such as for an upgrade, you must disable the {rh-openstack} compute node that the machine runs on by running the following command: ++ +[source,terminal] +---- +$ openstack compute service set nova-compute --disable +---- ++ +For more information, see link:https://access.redhat.com/documentation/en-us/red_hat_openstack_platform/17.1/html/configuring_the_compute_service_for_instance_creation/assembly_managing-instances_managing-instances#proc_preparing-to-migrate_migrating-instances[Preparing to migrate] in the {rh-openstack} documentation. + .Procedure . List the control plane machines in your cluster by running the following command: diff --git a/modules/installation-user-infra-generate-k8s-manifest-ignition.adoc b/modules/installation-user-infra-generate-k8s-manifest-ignition.adoc index 9d74a44dbf..96ccced651 100644 --- a/modules/installation-user-infra-generate-k8s-manifest-ignition.adoc +++ b/modules/installation-user-infra-generate-k8s-manifest-ignition.adoc @@ -193,11 +193,11 @@ Because you create and manage the worker machines yourself, you do not need to i endif::aws,azure,ash,gcp[] ifdef::osp,vsphere[] -. Remove the Kubernetes manifest files that define the control plane machines and compute machine sets: +. Remove the Kubernetes manifest files that define the control plane machines, compute machine sets, and control plane machine sets: + [source,terminal] ---- -$ rm -f openshift/99_openshift-cluster-api_master-machines-*.yaml openshift/99_openshift-cluster-api_worker-machineset-*.yaml +$ rm -f openshift/99_openshift-cluster-api_master-machines-*.yaml openshift/99_openshift-cluster-api_worker-machineset-*.yaml openshift/99_openshift-machine-api_master-control-plane-machine-set.yaml ---- + Because you create and manage these resources yourself, you do not have diff --git a/modules/nodes-control-plane-osp-migrating.adoc b/modules/nodes-control-plane-osp-migrating.adoc index 0c75476b09..376eaeb0af 100644 --- a/modules/nodes-control-plane-osp-migrating.adoc +++ b/modules/nodes-control-plane-osp-migrating.adoc @@ -4,9 +4,16 @@ :_content-type: PROCEDURE [id="nodes-control-plane-osp-migrating_{context}"] -= Migrating control plane nodes from one RHOSP host to another += Migrating control plane nodes from one RHOSP host to another manually -You can run a script that moves a control plane node from one {rh-openstack-first} node to another. +If control plane machine sets are not enabled on your cluster, you can run a script that moves a control plane node from one {rh-openstack-first} node to another. + +[NOTE] +==== +Control plane machine sets are not enabled on clusters that run on user-provisioned infrastructure. + +For information about control plane machine sets, see "Managing control plane machines with control plane machine sets". +==== .Prerequisites diff --git a/nodes/nodes/nodes-nodes-managing.adoc b/nodes/nodes/nodes-nodes-managing.adoc index 8ec80b3dae..8746a3c794 100644 --- a/nodes/nodes/nodes-nodes-managing.adoc +++ b/nodes/nodes/nodes-nodes-managing.adoc @@ -30,4 +30,8 @@ endif::openshift-webscale[] include::modules/nodes-nodes-swap-memory.adoc[leveloffset=+1] include::modules/nodes-control-plane-osp-migrating.adoc[leveloffset=+1] +[role="_additional-resources"] +.Additional resources + +* For information about control plane machine sets, see xref:../../machine_management/control_plane_machine_management/cpmso-using.adoc#cpmso-using[Managing control plane machines with control plane machine sets].