diff --git a/doc/source/advanced_deployment/baremetal_overcloud.rst b/doc/source/advanced_deployment/baremetal_overcloud.rst index cc5cdc87..21ef2087 100644 --- a/doc/source/advanced_deployment/baremetal_overcloud.rst +++ b/doc/source/advanced_deployment/baremetal_overcloud.rst @@ -56,7 +56,17 @@ TripleO workflows:: Then enroll only ``undercloud.json`` in your undercloud:: source stackrc - openstack baremetal import undercloud.json + openstack overcloud node import --provide undercloud.json + +.. admonition:: Stable Branch + :class: stable + + .. admonition:: Mitaka + :class: mitaka + + For TripleO release Mitaka, the nodes should be imported with:: + + openstack baremetal import undercloud.json .. admonition:: Virtual :class: virtual diff --git a/doc/source/advanced_deployment/root_device.rst b/doc/source/advanced_deployment/root_device.rst index 73c437ff..da0ea58b 100644 --- a/doc/source/advanced_deployment/root_device.rst +++ b/doc/source/advanced_deployment/root_device.rst @@ -30,13 +30,23 @@ automatically). Setting root device hints automatically ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Starting with the Newton release it is possible to autogenerate root device -hints for all nodes instead of setting them one by one. Pass the -``--root-device`` argument to the ``openstack baremetal configure boot`` -**after a successful introspection**. This argument can accept a device list -in the order of preference, for example:: +Starting with the Newton release it is possible to autogenerate root +device hints for all nodes instead of setting them one by one. Pass the +``--root-device`` argument to the ``openstack overcloud node +configure`` **after a successful introspection**. This argument can +accept a device list in the order of preference, for example:: - openstack baremetal configure boot --root-device=sdb,sdc,vda + openstack overcloud node configure --all-manageable --root-device=sdb,sdc,vda + +.. admonition:: Stable Branch + :class: stable + + .. admonition:: Mitaka + :class: mitaka + + For TripleO release Mitaka, the boot configuration command is:: + + openstack baremetal configure boot --root-device=sdb,sdc,vda It can also accept one of two strategies: ``smallest`` will pick the smallest device, ``largest`` will pick the largest one. By default only disk devices diff --git a/doc/source/advanced_deployment/upload_single_image.rst b/doc/source/advanced_deployment/upload_single_image.rst index 6ee2d3b9..264bea5e 100644 --- a/doc/source/advanced_deployment/upload_single_image.rst +++ b/doc/source/advanced_deployment/upload_single_image.rst @@ -9,6 +9,16 @@ before, with the ``--update-existing`` flag added:: Note that if the new image is a ramdisk, the Ironic nodes need to be re-configured to use it. This can be done by re-running:: - openstack baremetal configure boot + openstack overcloud node configure --all-manageable + +.. admonition:: Stable Branch + :class: stable + + .. admonition:: Mitaka + :class: mitaka + + For TripleO release Mitaka, the boot configuration command is:: + + openstack baremetal configure boot Now the new image should be fully ready for use by new deployments. diff --git a/doc/source/basic_deployment/basic_deployment_cli.rst b/doc/source/basic_deployment/basic_deployment_cli.rst index c847f7d1..a9475b0c 100644 --- a/doc/source/basic_deployment/basic_deployment_cli.rst +++ b/doc/source/basic_deployment/basic_deployment_cli.rst @@ -263,19 +263,33 @@ Register Nodes Register and configure nodes for your deployment with Ironic:: - openstack baremetal import instackenv.json + openstack overcloud node import instackenv.json The file to be imported may be either JSON, YAML or CSV format, and the type is detected via the file extension (json, yaml, csv). The file format is documented in :ref:`instackenv`. +The nodes status will be set to ``manageable`` by default, so that +introspection may later be run. To also run introspection and make the +nodes available for deployment in one step, the following flags can be +used:: + + openstack overcloud node import --introspect --provide instackenv.json + .. admonition:: Stable Branch :class: stable - For TripleO release Mitaka and older the following command must be run - after registration to assign the deployment kernel and ramdisk to all nodes: + .. admonition:: Mitaka + :class: mitaka - openstack baremetal configure boot + For TripleO release Mitaka, the import command is:: + + openstack baremetal import instackenv.json + + The following command must be run after registration to assign the + deployment kernel and ramdisk to all nodes:: + + openstack baremetal configure boot Starting with the Newton release you can take advantage of the ``enroll`` provisioning state - see :doc:`../advanced_deployment/node_states` for details. @@ -313,10 +327,28 @@ Introspect Nodes Then verify the results as described in :ref:`running_validation_group`. +Nodes must be in the ``manageable`` provisioning state in order to run +introspection. Introspect hardware attributes of nodes with:: -Introspect hardware attributes of nodes:: + openstack overcloud node introspect --all-manageable - openstack baremetal introspection bulk start +Nodes can also be specified individually by UUID. The ``--provide`` +flag can be used in order to move the nodes automatically to the +``available`` provisioning state once the introspection is finished, +making the nodes available for deployment. +:: + + openstack overcloud node introspect --all-manageable --provide + +.. admonition:: Stable Branch + :class: stable + + .. admonition:: Mitaka + :class: mitaka + + For TripleO release Mitaka, the introspection command is:: + + openstack baremetal introspection bulk start .. note:: **Introspection has to finish without errors.** The process can take up to 5 minutes for VM / 15 minutes for baremetal. If @@ -325,6 +357,16 @@ Introspect hardware attributes of nodes:: .. note:: If you need to introspect just a single node, see :doc:`../advanced_deployment/introspect_single_node` +Provide Nodes +------------- + +Only nodes in the ``available`` provisioning state can be deployed to +(see :doc:`../advanced_deployment/node_states` for details). To move +nodes from ``manageable`` to ``available`` the following command can be +used:: + + openstack overcloud node provide --all-manageable + Flavor Details -------------- @@ -557,10 +599,6 @@ The overcloud can be redeployed when desired. # This command should show no stack once the Delete has completed heat stack-list -#. Although not required, introspection can be rerun:: - - openstack baremetal introspection bulk start - #. Deploy the Overcloud again:: openstack overcloud deploy --templates diff --git a/doc/source/post_deployment/build_single_image.rst b/doc/source/post_deployment/build_single_image.rst index f0cce3b2..f972c337 100644 --- a/doc/source/post_deployment/build_single_image.rst +++ b/doc/source/post_deployment/build_single_image.rst @@ -31,7 +31,17 @@ before, with the ``--update-existing`` flag added:: Note that if the new image is a ramdisk, the Ironic nodes need to be re-configured to use it. This can be done by re-running:: - openstack baremetal configure boot + openstack overcloud node configure --all-manageable + +.. admonition:: Stable Branch + :class: stable + + .. admonition:: Mitaka + :class: mitaka + + For TripleO release Mitaka, the boot configuration command is:: + + openstack baremetal configure boot .. note:: If you want to use custom images for boot configuration, specify their names in