From 307975ae4818ea5a510cfcb01bdb1f37fa563109 Mon Sep 17 00:00:00 2001 From: Yikun Jiang Date: Tue, 6 Feb 2018 11:36:38 +0800 Subject: [PATCH] Fix wrong link for "Manage Flavors" in CPU topologies doc The last sentence here where it links to "Manage Flavors" is the wrong link. It goes here: https://docs.openstack.org/nova/latest/admin/flavors.html which doesn't talk about NUMA extra specs. It should be pointing at the "NUMA topology" section of the flavor extra specs page: https://docs.openstack.org/nova/latest/user/flavors.html#extra-specs-numa-topology Conflicts: doc/source/user/flavors.rst NOTE(mriedem): The conflict is due to a change in Queens Ia57c93ef1e72ccf134ba6fc7fcb85ab228d68a47 which refactored where the flavor docs live. Change-Id: I30f6bc70afc5be00737cdf76e0e47bcb898a3a7f Closes-Bug: #1747562 (cherry picked from commit 26de90a14d527ae18dd6cd39d4fdf589dd449fb6) --- doc/source/admin/cpu-topologies.rst | 3 ++- doc/source/admin/flavors.rst | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/source/admin/cpu-topologies.rst b/doc/source/admin/cpu-topologies.rst index 863eb0187771..e795a0fb8e28 100644 --- a/doc/source/admin/cpu-topologies.rst +++ b/doc/source/admin/cpu-topologies.rst @@ -163,7 +163,8 @@ memory mapping between the two nodes, run: driver will not spawn instances with such topologies. For more information about the syntax for ``hw:numa_nodes``, ``hw:numa_cpus.N`` -and ``hw:num_mem.N``, refer to the :doc:`/admin/flavors` guide. +and ``hw:num_mem.N``, refer to the :ref:`NUMA +topology ` guide. Customizing instance CPU pinning policies ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/source/admin/flavors.rst b/doc/source/admin/flavors.rst index 906edbcaecaf..ccce05dfad08 100644 --- a/doc/source/admin/flavors.rst +++ b/doc/source/admin/flavors.rst @@ -411,6 +411,8 @@ CPU pinning policy The ``hw:cpu_thread_policy`` option is only valid if ``hw:cpu_policy`` is set to ``dedicated``. +.. _extra-specs-numa-topology: + NUMA topology For the libvirt driver, you can define the host NUMA placement for the instance vCPU threads as well as the allocation of instance vCPUs and memory