From b6eb92becaa0cb0d4315a1d7f799adbb7abe65ea Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Thu, 22 Feb 2018 16:54:26 +0000 Subject: [PATCH] [Docs] Move limited connectivity to user guide This is a user story and should be treated as such. Change-Id: Id7b7e58aaaf0630b9b1b99796c39eebbc28e0b04 --- deploy-guide/source/app.rst | 1 - deploy-guide/source/conf.py | 2 +- deploy-guide/source/deploymenthost.rst | 4 +++- doc/source/user/index.rst | 1 + .../source/user/limited-connectivity/index.rst | 8 +++----- 5 files changed, 8 insertions(+), 8 deletions(-) rename deploy-guide/source/app-limited-connectivity.rst => doc/source/user/limited-connectivity/index.rst (96%) diff --git a/deploy-guide/source/app.rst b/deploy-guide/source/app.rst index 3facb1a825..adadcf8395 100644 --- a/deploy-guide/source/app.rst +++ b/deploy-guide/source/app.rst @@ -5,6 +5,5 @@ Appendices .. toctree:: :maxdepth: 2 - app-limited-connectivity.rst app-advanced-config-sslcertificates.rst app-resources.rst diff --git a/deploy-guide/source/conf.py b/deploy-guide/source/conf.py index cad35b1c42..18cef1f02c 100644 --- a/deploy-guide/source/conf.py +++ b/deploy-guide/source/conf.py @@ -335,7 +335,7 @@ if watermark == "": dev_branch_link_name = "" deploy_guide_prefix = "http://docs.openstack.org/project-deploy-guide/openstack-ansible/{}/%s".format(deploy_branch_link_name) -dev_docs_prefix = "http://docs.openstack.org/openstack-ansible/{}%s".format(dev_branch_link_name) +dev_docs_prefix = "http://docs.openstack.org/openstack-ansible/{}/%s".format(deploy_branch_link_name) role_docs_prefix = "http://docs.openstack.org/openstack-ansible-%s/{}".format(dev_branch_link_name) extlinks = {'deploy_guide': (deploy_guide_prefix, ''), diff --git a/deploy-guide/source/deploymenthost.rst b/deploy-guide/source/deploymenthost.rst index e2171c6f28..19103942e9 100644 --- a/deploy-guide/source/deploymenthost.rst +++ b/deploy-guide/source/deploymenthost.rst @@ -154,7 +154,9 @@ Install the source and dependencies for the deployment host. .. note:: If you are installing with limited connectivity, please review - :ref:`limited-connectivity-appendix` before proceeding. + :dev_docs:`Installing with limited connectivity + ` + before proceeding. #. Clone the latest stable release of the OpenStack-Ansible Git repository in the ``/opt/openstack-ansible`` directory: diff --git a/doc/source/user/index.rst b/doc/source/user/index.rst index a1d97827c3..49ad9637a3 100644 --- a/doc/source/user/index.rst +++ b/doc/source/user/index.rst @@ -25,5 +25,6 @@ For in-depth technical information, see the aio/quickstart.rst test/example.rst prod/example.rst + limited-connectivity/index.rst l3pods/example.rst ceph/full-deploy.rst diff --git a/deploy-guide/source/app-limited-connectivity.rst b/doc/source/user/limited-connectivity/index.rst similarity index 96% rename from deploy-guide/source/app-limited-connectivity.rst rename to doc/source/user/limited-connectivity/index.rst index 907b586bee..7c084b7fa1 100644 --- a/deploy-guide/source/app-limited-connectivity.rst +++ b/doc/source/user/limited-connectivity/index.rst @@ -1,8 +1,6 @@ -.. _limited-connectivity-appendix: - -================================================ -Appendix H: Installing with limited connectivity -================================================ +==================================== +Installing with limited connectivity +==================================== Many playbooks and roles in OpenStack-Ansible retrieve dependencies from the public Internet by default. Many deployers block direct outbound connectivity