Merge ~d-info-e/cloud-init:fix-openstack-doc into cloud-init:master

Proposed by do3meli
Status: Merged
Approved by: Scott Moser
Approved revision: be67e06d2b6a31a85cba4e216ae4897e6825c21e
Merge reported by: Chad Smith
Merged at revision: a510726d622b9d1768b5417d09277d5cc786e952
Proposed branch: ~d-info-e/cloud-init:fix-openstack-doc
Merge into: cloud-init:master
Diff against target: 21 lines (+2/-2)
1 file modified
doc/rtd/topics/datasources/openstack.rst (+2/-2)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Scott Moser Approve
Review via email: mp+342250@code.launchpad.net

Commit message

doc: Fix links in OpenStack datasource documentation.

Fix link to external openstack resource and to internal vendor data.

LP: #1721660

To post a comment you must log in.
Revision history for this message
Scott Moser (smoser) :
review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/947/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/947/rebuild

review: Approve (continuous-integration)
Revision history for this message
Chad Smith (chad.smith) wrote :

An upstream commit landed for this bug.

To view that commit see the following URL:
https://git.launchpad.net/cloud-init/commit/?id=a510726d

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/doc/rtd/topics/datasources/openstack.rst b/doc/rtd/topics/datasources/openstack.rst
2index 607b70f..43592de 100644
3--- a/doc/rtd/topics/datasources/openstack.rst
4+++ b/doc/rtd/topics/datasources/openstack.rst
5@@ -5,7 +5,7 @@ OpenStack
6
7 This datasource supports reading data from the
8 `OpenStack Metadata Service
9-<http://docs.openstack.org/admin-guide/compute-networking-nova.html#metadata-service>`_.
10+<https://docs.openstack.org/nova/latest/admin/networking-nova.html#metadata-service>`_.
11
12 Configuration
13 -------------
14@@ -59,6 +59,6 @@ upgrade packages and install ``htop`` on all instances:
15 {"cloud-init": "#cloud-config\npackage_upgrade: True\npackages:\n - htop"}
16
17 For more general information about how cloud-init handles vendor data,
18-including how it can be disabled by users on instances, see `Vendor Data`_.
19+including how it can be disabled by users on instances, see :doc:`/topics/vendordata`.
20
21 .. vi: textwidth=78

Subscribers

People subscribed via source and target branches