From 38db1948ed75d724366a9977aad28e988d087164 Mon Sep 17 00:00:00 2001 From: Alexandra Settle Date: Wed, 30 Nov 2016 15:30:24 +0000 Subject: [PATCH] [DOCS] Adding deploy guide to index Change-Id: I19f6514a8ffb6c98f33f50b5de20bf6a259ffbdd --- deploy-guide/source/index.rst | 3 --- doc/source/index.rst | 10 +++++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/deploy-guide/source/index.rst b/deploy-guide/source/index.rst index 1422096353..5617724067 100644 --- a/deploy-guide/source/index.rst +++ b/deploy-guide/source/index.rst @@ -17,9 +17,6 @@ intended for deployers. verify-operation.rst app.rst -Disclaimer -~~~~~~~~~~ - Third-party trademarks and tradenames appearing in this document are the property of their respective owners. Such third-party trademarks have been printed in caps or initial caps and are used for referential diff --git a/doc/source/index.rst b/doc/source/index.rst index b53c09d426..8a93ce42c6 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -19,12 +19,17 @@ review. .. toctree:: :maxdepth: 1 - .. TODO: Add deploy guide once asettle has live link upgrade-guide/index developer-docs/index +The OpenStack-Ansible Deployment Guide is currently in development. The +Ocata draft guide is available for review: + +* `OpenStack-Ansible Ocata Deployment Guide`_ + .. _Ocata series timeline: https://launchpad.net/openstack-ansible/trunk .. _Ocata series release notes: http://docs.openstack.org/releasenotes/openstack-ansible/unreleased.html +.. _OpenStack-Ansible Ocata Deployment Guide: http://docs.openstack.org/project-deploy-guide/draft/ Newton: Current stable release, security supported ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -34,6 +39,8 @@ OpenStack-Ansible's Newton series was first released with the 14.0.0 tag on * `OpenStack-Ansible Newton documentation`_ +* `OpenStack-Ansible Newton Deployment Guide`_ + * `OpenStack-Ansible Newton series release notes`_ * `OpenStack-Ansible Newton series timeline`_ @@ -41,6 +48,7 @@ OpenStack-Ansible's Newton series was first released with the 14.0.0 tag on .. _OpenStack-Ansible Newton documentation: http://docs.openstack.org/developer/openstack-ansible/newton/ .. _OpenStack-Ansible Newton series timeline: https://launchpad.net/openstack-ansible/newton .. _OpenStack-Ansible Newton series release notes: http://docs.openstack.org/releasenotes/openstack-ansible/newton.html +.. _OpenStack-Ansible Newton Deployment Guide: http://docs.openstack.org/project-deploy-guide/newton/ Mitaka: Security-supported (EOL: 2017-04-10) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~