From 8c1c7642744ac09b933c0b0d28d098cb1b2a2a12 Mon Sep 17 00:00:00 2001 From: Peter Matulis Date: Thu, 1 Sep 2022 17:20:17 -0400 Subject: [PATCH] Improve internal links For internal links to the deploy-guide or, via intersphinx, to the charm-guide use direct Sphinx links (instead of manual or manual+redirected URLs). Change-Id: I509966b2e58c7cd4e7943fbabb530d7178a93118 --- deploy-guide/source/configure-openstack.rst | 4 +--- deploy-guide/source/install-openstack.rst | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/deploy-guide/source/configure-openstack.rst b/deploy-guide/source/configure-openstack.rst index 3ca221f..414630a 100644 --- a/deploy-guide/source/configure-openstack.rst +++ b/deploy-guide/source/configure-openstack.rst @@ -412,12 +412,10 @@ You now have a functional OpenStack cloud managed by MAAS-backed Juju. As next steps, consider browsing these documentation sources: -* `OpenStack Charm Guide`_: the primary source of information for OpenStack - charms +* :doc:`cg:index`: the primary source of information for OpenStack charms * `OpenStack Administrator Guides`_: upstream OpenStack administrative help .. LINKS .. _openstack-bundles: https://github.com/openstack-charmers/openstack-bundles .. _Reserved IP range: https://maas.io/docs/concepts-and-terms#heading--ip-ranges -.. _OpenStack Charm Guide: https://docs.openstack.org/charm-guide .. _OpenStack Administrator Guides: http://docs.openstack.org/user-guide-admin/content diff --git a/deploy-guide/source/install-openstack.rst b/deploy-guide/source/install-openstack.rst index 8bb935c..ae78581 100644 --- a/deploy-guide/source/install-openstack.rst +++ b/deploy-guide/source/install-openstack.rst @@ -17,8 +17,8 @@ to review these pertinent sections of the Juju documentation before continuing: .. TODO Cloud topology section goes here (modelled on openstack-base README) -This page will show how to install a minimal non-HA OpenStack cloud. See -`Infrastructure high availability`_ for guidance on that subject. +This page will show how to install a minimal non-HA OpenStack cloud. See the +:doc:`cg:admin/ha` page in the Charm Guide for guidance on that subject. Specification of software versions ---------------------------------- @@ -774,13 +774,11 @@ networks, images, and a user environment. Go to :doc:`Configure OpenStack ` now. .. LINKS -.. _OpenStack Charms: https://docs.openstack.org/charm-guide/latest/openstack-charms.html .. _Charmhub: https://charmhub.io .. _Deploying applications: https://juju.is/docs/olm/deploy-a-charm-from-charmhub .. _Deploying to specific machines: https://juju.is/docs/olm/deploy-to-a-specific-machine .. _Managing relations: https://juju.is/docs/olm/manage-relations .. _vault charm: https://charmhub.io/vault/ -.. _Infrastructure high availability: https://docs.openstack.org/charm-guide/latest/admin/ha.html .. CHARMS .. _ceph-mon: https://charmhub.io/ceph-mon