From 4b247d1232d8d94ee7784348cd2c65bb5c19efb8 Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Mon, 25 Nov 2019 14:55:33 +1300 Subject: [PATCH] Update docs for node delete with baremetal provisioning This change replaces the scale-down instructions to use the existing openstack overcloud node delete command, which now supports baremetal provisioning. Change-Id: I4420309cdde9a5647bd1ae512690eb410e2e3047 Depends-On: https://review.opendev.org/#/c/695622/ Blueprint: nova-less-deploy --- .../source/post_deployment/delete_nodes.rst | 6 ++-- .../provisioning/baremetal_provision.rst | 30 +++++++------------ 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/deploy-guide/source/post_deployment/delete_nodes.rst b/deploy-guide/source/post_deployment/delete_nodes.rst index 2f81a319..20c3a003 100644 --- a/deploy-guide/source/post_deployment/delete_nodes.rst +++ b/deploy-guide/source/post_deployment/delete_nodes.rst @@ -11,8 +11,10 @@ This command updates the heat stack with updated numbers and list of resource IDs (which represent nodes) to be deleted. .. note:: - If you are :ref:`baremetal_provision` then follow those instructions for - scaling down instead of using ``openstack overcloud node delete``. + If you are :ref:`baremetal_provision` then follow those + scale-down instructions to call ``openstack overcloud node delete`` with a + ``--baremetal-deployment`` argument instead of passing a list of nodes to + delete as arguments. .. note:: If you passed any extra environment files when you created the overcloud (for diff --git a/deploy-guide/source/provisioning/baremetal_provision.rst b/deploy-guide/source/provisioning/baremetal_provision.rst index 6fd726d8..b0ec43a2 100644 --- a/deploy-guide/source/provisioning/baremetal_provision.rst +++ b/deploy-guide/source/provisioning/baremetal_provision.rst @@ -3,7 +3,7 @@ Provisioning Baremetal Before Overcloud Deploy ============================================== -Baremetal provisioning is a feature which interacts directly with the +Baremetal provisioning is a feature which interacts directly with the Bare Metal service to provision baremetal before the overcloud is deployed. This adds a new provision step before the overcloud deploy, and the output of the provision is a valid :doc:`../features/deployed_server` configuration. @@ -287,12 +287,8 @@ to increment the ``count`` in the roles to be scaled up (and add any desired Scaling Down ^^^^^^^^^^^^ -Scaling down an overcloud is different from scaling up for two reasons: - -* Specific nodes need to be selected to unprovision - -* After the overcloud deploy, an extra step is required to unprovision the - baremetal nodes +Scaling down is done with the ``openstack overcloud node delete`` command but +the nodes to delete are not passed as command arguments. To scale down an existing overcloud edit ``~/overcloud_baremetal_deploy.yaml`` to decrement the ``count`` in the roles @@ -323,16 +319,14 @@ For example the following would remove ``overcloud-controller-1`` - hostname: overcloud-controller-2 name: node02 -When the :ref:`deploying-the-overcloud` steps are then followed, the result -will be an overcloud which is configured to have those nodes removed, however -the removed nodes will still be running in a provisioned state, so the final -step is to unprovision those nodes:: +Then the delete command will be called with ``--baremetal-deployment`` +instead of passing node arguments:: - openstack overcloud node unprovision \ - --stack overcloud \ - ~/overcloud_baremetal_deploy.yaml + openstack overcloud node delete \ + --stack overcloud \ + --baremetal-deployment ~/overcloud_baremetal_deploy.yaml -Before any node is unprovisioned a list of nodes to unprovision is displayed +Before any node is deleted, a list of nodes to delete is displayed with a confirmation prompt. What to do when scaling back up depends on the situation. If the scale-down @@ -359,10 +353,6 @@ example - hostname: overcloud-controller-3 name: node11 -.. note:: - This scale-down approach should be used instead of using the ``openstack - overcloud node delete`` command. - Unprovisioning All Nodes ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -375,4 +365,4 @@ the ``--all`` argument:: --stack overcloud \ ~/overcloud_baremetal_deploy.yaml -.. _metalsmith: https://docs.openstack.org/metalsmith/ \ No newline at end of file +.. _metalsmith: https://docs.openstack.org/metalsmith/