diff options
| author | Zuul <zuul@review.opendev.org> | 2020-02-24 22:19:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-02-24 22:19:32 +0000 |
| commit | 77210a30182c866b067d0dcfd7d624ee2c283fc9 (patch) | |
| tree | cdf4cd95692c30155cce4e4b12274f718a08ae2a | |
| parent | 2709e185913519e2f96e246a6d3c8b34698c1a0f (diff) | |
| parent | 16bf70d5b9071dcc60e98bdfdd5924c2bb9ab216 (diff) | |
| download | heat-77210a30182c866b067d0dcfd7d624ee2c283fc9.tar.gz | |
Merge "Docs: Fix links broken since Train release" into stable/train
| -rw-r--r-- | doc/source/glossary.rst | 9 | ||||
| -rw-r--r-- | doc/source/template_guide/software_deployment.rst | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/doc/source/glossary.rst b/doc/source/glossary.rst index 316a3c9db..5e6bfd8a9 100644 --- a/doc/source/glossary.rst +++ b/doc/source/glossary.rst @@ -57,9 +57,8 @@ Metadata service A Compute service that enables virtual machine instances to - retrieve instance-specific data. See :nova-doc:`Metadata - service (OpenStack Administrator Guide) - <admin/networking-nova.html#metadata-service>`. + retrieve instance-specific data. See :nova-doc:`Nova Metadata + service documentation <user/metadata.html#metadata-service>`. Multi-region A feature of Heat that supports deployment to multiple regions. @@ -161,8 +160,8 @@ User data A :term:`resource property` that contains a user-provided data blob. User data gets passed to `cloud-init`_ to automatically - configure instances at boot time. See also :nova-doc:`User data - (OpenStack End User Guide) <user/user-data.html>`. + configure instances at boot time. See also :nova-doc:`Nova User data + documentation <user/metadata.html#user-provided-data>`. .. _cloud-init: https://cloudinit.readthedocs.io/ diff --git a/doc/source/template_guide/software_deployment.rst b/doc/source/template_guide/software_deployment.rst index 8f3accebb..166e396eb 100644 --- a/doc/source/template_guide/software_deployment.rst +++ b/doc/source/template_guide/software_deployment.rst @@ -53,7 +53,7 @@ User-data boot scripts and cloud-init When booting a server it is possible to specify the contents of the user-data to be passed to that server. This user-data is made available either from configured config-drive or from the :nova-doc:`Metadata service -<admin/networking-nova.html#metadata-service>` +<user/metadata.html#metadata-service>` How this user-data is consumed depends on the image being booted, but the most commonly used tool for default cloud images is cloud-init_. |