diff options
| author | Zuul <zuul@review.opendev.org> | 2020-11-09 17:24:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-11-09 17:24:18 +0000 |
| commit | a0e3069482003cbc290cdfcb4186d21b269ccc92 (patch) | |
| tree | 743e9640d4d79c1ec1c0922221c62e901bc5352a | |
| parent | 059d53d4c3b0c6a72cb12be3750a92cecfdde315 (diff) | |
| parent | a919cc0cbd7d0929befec4de957ff203be366ae4 (diff) | |
| download | nova-a0e3069482003cbc290cdfcb4186d21b269ccc92.tar.gz | |
Merge "[doc]: Fix glance image_metadata link" into stable/victoria
| -rw-r--r-- | doc/source/admin/configuration/hypervisor-xen-libvirt.rst | 2 | ||||
| -rw-r--r-- | doc/source/admin/cpu-topologies.rst | 2 | ||||
| -rw-r--r-- | doc/source/admin/huge-pages.rst | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/source/admin/configuration/hypervisor-xen-libvirt.rst b/doc/source/admin/configuration/hypervisor-xen-libvirt.rst index 3cb2cf5de0..3e548686c9 100644 --- a/doc/source/admin/configuration/hypervisor-xen-libvirt.rst +++ b/doc/source/admin/configuration/hypervisor-xen-libvirt.rst @@ -158,7 +158,7 @@ Use the following as a guideline for configuring Xen for use in OpenStack: $ openstack image set --property hypervisor_type=xen vm_mode=hvm IMAGE For more information on image metadata, refer to the `OpenStack Virtual - Image Guide <https://docs.openstack.org/image-guide/image-metadata.html>`__. + Image Guide <https://docs.openstack.org/image-guide/introduction.html#image-metadata>`__. #. **Libguestfs file injection**: OpenStack compute nodes can use `libguestfs <http://libguestfs.org/>`_ to inject files into an instance's image prior to diff --git a/doc/source/admin/cpu-topologies.rst b/doc/source/admin/cpu-topologies.rst index 5639abdd6a..5c2a1c9740 100644 --- a/doc/source/admin/cpu-topologies.rst +++ b/doc/source/admin/cpu-topologies.rst @@ -665,6 +665,6 @@ memory allocation turned on. The Hyper-V driver will ignore the configured instances with a NUMA topology. .. Links -.. _`Image metadata`: https://docs.openstack.org/image-guide/image-metadata.html +.. _`Image metadata`: https://docs.openstack.org/image-guide/introduction.html#image-metadata .. _`discussion`: http://lists.openstack.org/pipermail/openstack-dev/2016-March/090367.html .. _`MTTCG project`: http://wiki.qemu.org/Features/tcg-multithread diff --git a/doc/source/admin/huge-pages.rst b/doc/source/admin/huge-pages.rst index 3ce61d501b..3a77756564 100644 --- a/doc/source/admin/huge-pages.rst +++ b/doc/source/admin/huge-pages.rst @@ -239,4 +239,4 @@ guide. .. Links .. _`Linux THP guide`: https://www.kernel.org/doc/Documentation/vm/transhuge.txt .. _`Linux hugetlbfs guide`: https://www.kernel.org/doc/Documentation/vm/hugetlbpage.txt -.. _`Image metadata`: https://docs.openstack.org/image-guide/image-metadata.html +.. _`Image metadata`: https://docs.openstack.org/image-guide/introduction.html#image-metadata |