openstack
/
nova
Code Issues Proposed changes

doc: correct the link to user/flavor.rst 

In commit a76277f81a, the introduction
of flavor extra specs, such as 'hw:cpu_policy', 'hw:cpu_thread_policy'
and ... , have been moved to 'doc/source/user/flavors.rst' from
'doc/source/admin/flavors.rst', while in 'cpu-topologiest.rst' this
change hasn't been updated. Apply this change.

Conflicts:
  doc/source/admin/cpu-topologies.rst

NOTE(takashin): The conflict is because change
    Iad7864bf375341ef065bfec229a059e444c910e2 is not in Ussuri.

Change-Id: I031a5ea6de00a8c5cf67897ddb78075c8bc79c0b
Signed-off-by: Wang Huaqiang <huaqiang.wang@intel.com>
(cherry picked from commit db7f263406)
This commit is contained in:
Wang Huaqiang 2020-07-09 15:32:19 +08:00 committed by Takashi Natsume
parent f20188995a
commit 7c0b94c858
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/source/admin/cpu-topologies.rst
View File

@ -223,7 +223,7 @@ use pinned CPUs. To configure a flavor to use the ``shared`` CPU policy, run:
.. note:: .. note::
For more information about the syntax for ``hw:cpu_policy``, refer to the For more information about the syntax for ``hw:cpu_policy``, refer to the
:doc:`/admin/flavors` guide. :doc:`/user/flavors` guide.
It is also possible to configure the CPU policy via image metadata. This can It is also possible to configure the CPU policy via image metadata. This can
be useful when packaging applications that require real-time or near real-time be useful when packaging applications that require real-time or near real-time
@ -334,7 +334,7 @@ This does not utilize traits and, as such, there is no trait-based equivalent.
.. note:: .. note::
For more information about the syntax for ``hw:cpu_thread_policy``, refer to For more information about the syntax for ``hw:cpu_thread_policy``, refer to
the :doc:`/admin/flavors` guide. the :doc:`/user/flavors` guide.
As with CPU policies, it also possible to configure the CPU thread policy via As with CPU policies, it also possible to configure the CPU thread policy via
image metadata. This can be useful when packaging applications that require image metadata. This can be useful when packaging applications that require
@ -421,7 +421,7 @@ instance should be run on the pool of host cores listed in
.. note:: .. note::
For more information about the syntax for ``hw:emulator_threads_policy``, For more information about the syntax for ``hw:emulator_threads_policy``,
refer to the :doc:`/admin/flavors` guide. refer to the :doc:`/user/flavors` guide.
Customizing instance CPU topologies Customizing instance CPU topologies
----------------------------------- -----------------------------------
@ -475,7 +475,7 @@ Similarly, to configure a flavor to use one core and one thread, run:
with ten cores fails. with ten cores fails.
For more information about the syntax for ``hw:cpu_sockets``, ``hw:cpu_cores`` For more information about the syntax for ``hw:cpu_sockets``, ``hw:cpu_cores``
and ``hw:cpu_threads``, refer to the :doc:`/admin/flavors` guide. and ``hw:cpu_threads``, refer to the :doc:`/user/flavors` guide.
It is also possible to set upper limits on the number of sockets, cores, and It is also possible to set upper limits on the number of sockets, cores, and
threads used. Unlike the hard values above, it is not necessary for this exact threads used. Unlike the hard values above, it is not necessary for this exact
@ -490,7 +490,7 @@ instance topology, run:
For more information about the syntax for ``hw:cpu_max_sockets``, For more information about the syntax for ``hw:cpu_max_sockets``,
``hw:cpu_max_cores``, and ``hw:cpu_max_threads``, refer to the ``hw:cpu_max_cores``, and ``hw:cpu_max_threads``, refer to the
:doc:`/admin/flavors` guide. :doc:`/user/flavors` guide.
Applications are frequently packaged as images. For applications that prefer Applications are frequently packaged as images. For applications that prefer
certain CPU topologies, configure image metadata to hint that created instances certain CPU topologies, configure image metadata to hint that created instances