From 2ad5c39ca2d40d62806266018f6c83174b1acc32 Mon Sep 17 00:00:00 2001 From: Derek Higgins Date: Wed, 21 Nov 2018 14:33:44 +0000 Subject: [PATCH] Remove redundant mentions of boot_option boot_option=local is now the default so no need to set it explicitly. Depends-On: I4047298ac5af8a0314ace343518f695144073ff5 Change-Id: Ib3537d18cfab2e7d1513c528c2a43d9ed3041a59 Related-Bug: #1803965 --- .../advanced_deployment/node_placement.rst | 2 +- .../advanced_deployment/profile_matching.rst | 18 +++++++----------- .../install/advanced_deployment/uefi_boot.rst | 11 ++++++----- doc/source/install/mistral-api/mistral-api.rst | 5 ++--- 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/doc/source/install/advanced_deployment/node_placement.rst b/doc/source/install/advanced_deployment/node_placement.rst index 66ac78ee..e5e7f23e 100644 --- a/doc/source/install/advanced_deployment/node_placement.rst +++ b/doc/source/install/advanced_deployment/node_placement.rst @@ -21,7 +21,7 @@ by the Nova scheduler on deployment. This can either be done via the nodes json file when registering the nodes, or alternatively via manual adjustment of the node capabilities, e.g:: - openstack baremetal node set --property capabilities='node:controller-0,boot_option:local' + openstack baremetal node set --property capabilities='node:controller-0' This has assigned the capability ``node:controller-0`` to the node, and this must be repeated (using a unique continuous index, starting from 0) for all diff --git a/doc/source/install/advanced_deployment/profile_matching.rst b/doc/source/install/advanced_deployment/profile_matching.rst index b19d6936..2298fd4f 100644 --- a/doc/source/install/advanced_deployment/profile_matching.rst +++ b/doc/source/install/advanced_deployment/profile_matching.rst @@ -18,31 +18,27 @@ There are two ways to assign a profile to a node. You can assign it directly or specify one or many suitable profiles for the deployment command to choose from. It can be done either manually or using the introspection rules. -.. note:: - Do not miss the "boot_option" part from any commands below, - otherwise your deployment won't work as expected. - Manual profile tagging ---------------------- To assign a profile to a node directly, issue the following command:: - openstack baremetal node set --property capabilities=profile:,boot_option:local + openstack baremetal node set --property capabilities=profile: Alternatively, you can provide a number of profiles as capabilities in form of ``_profile:1``, which later can be automatically converted to one assigned profile (see `Use the flavors to deploy`_ for details). For example:: - openstack baremetal node set --property capabilities=compute_profile:1,control_profile:1,boot_option:local + openstack baremetal node set --property capabilities=compute_profile:1,control_profile:1 Finally, to clean all profile information from a node use:: - openstack baremetal node set --property capabilities=boot_option:local + openstack baremetal node unset --property capabilities .. note:: - We can not update only a single key from the capabilities dictionary, so we - need to specify both the profile and the boot_option above. Otherwise, the - boot_option key will get removed. + We can not update only a single key from the capabilities dictionary, so if + it contained more then just the profile information then this will need to + be set for the node. Also see :ref:`instackenv` for details on how to set profile in the ``instackenv.json`` file. @@ -209,7 +205,7 @@ they can be created as follows. needs to have the property ``capabilities:profile`` set to the intended profile:: - openstack flavor set --property "cpu_arch"="x86_64" --property "capabilities:boot_option"="local" --property "capabilities:profile"="my-profile" my-flavor + openstack flavor set --property "cpu_arch"="x86_64" --property "capabilities:profile"="my-profile" my-flavor .. note:: The flavor name does not have to match the profile name, although it's diff --git a/doc/source/install/advanced_deployment/uefi_boot.rst b/doc/source/install/advanced_deployment/uefi_boot.rst index 95ea8e1f..8858f4aa 100644 --- a/doc/source/install/advanced_deployment/uefi_boot.rst +++ b/doc/source/install/advanced_deployment/uefi_boot.rst @@ -46,22 +46,23 @@ configure introspected nodes to deploy in UEFI mode as well. Here is how the ``properties`` field looks for nodes configured in BIOS mode:: $ openstack baremetal node show -f value -c properties - {u'capabilities': u'profile:compute,boot_option:local,boot_mode:bios', u'memory_mb': u'6144', u'cpu_arch': u'x86_64', u'local_gb': u'49', u'cpus': u'1'} + {u'capabilities': u'profile:compute,boot_mode:bios', u'memory_mb': u'6144', u'cpu_arch': u'x86_64', u'local_gb': u'49', u'cpus': u'1'} Note that ``boot_mode:bios`` capability is set. For a node in UEFI mode, it will look like this:: $ openstack baremetal node show -f value -c properties - {u'capabilities': u'profile:compute,boot_option:local,boot_mode:uefi', u'memory_mb': u'6144', u'cpu_arch': u'x86_64', u'local_gb': u'49', u'cpus': u'1'} + {u'capabilities': u'profile:compute,boot_mode:uefi', u'memory_mb': u'6144', u'cpu_arch': u'x86_64', u'local_gb': u'49', u'cpus': u'1'} You can change the boot mode with the following command (required for UEFI before the Pike release):: - $ openstack baremetal node set --property capabilities=profile:compute,boot_option:local,boot_mode:uefi + $ openstack baremetal node set --property capabilities=profile:compute,boot_mode:uefi .. warning:: - Do not forget to copy all other capabilities, particularly ``profile`` and - ``boot_option``, literally. + Do not forget to copy all other capabilities, e.g. ``profile`` and + ``boot_option`` if present. + Finally, you may configure your flavors to explicitly request nodes that boot in UEFI mode, for example:: diff --git a/doc/source/install/mistral-api/mistral-api.rst b/doc/source/install/mistral-api/mistral-api.rst index 952441c2..675fa098 100644 --- a/doc/source/install/mistral-api/mistral-api.rst +++ b/doc/source/install/mistral-api/mistral-api.rst @@ -189,7 +189,6 @@ in, rather than working inline. "remove": false, "ramdisk_name": "bm-deploy-ramdisk", "kernel_name": "bm-deploy-kernel", - "instance_boot_option": "local", "nodes_json": [ { "pm_password": "$RSA_PRIVATE_KEY", @@ -212,8 +211,8 @@ in, rather than working inline. will be removed. * ``ramdisk_name`` and ``kernel_name`` are the Glance names for the kernel and ramdisk to use for the nodes. -* ``instance_boot_option`` defines whether to set instances for booting from - the local hard drive (local) or network (netboot). +* If ``instance_boot_option`` is set, it defines whether to set instances for + booting from the local hard drive (local) or network (netboot). * The format of the nodes_json is documented in :ref:`instackenv`. .. code-block:: bash