openstack/openstack-ansible
Code Issues Proposed changes

Merge "[DOCS] Adding deploy guide to index"

Browse Source
This commit is contained in:
Jenkins 2016-11-30 16:47:43 +00:00 committed by Gerrit Code Review
commit 065ce1a9c8
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deploy-guide/source/index.rst
View File

@ -17,9 +17,6 @@ intended for deployers.
verify-operation.rst verify-operation.rst
app.rst app.rst
Disclaimer
~~~~~~~~~~
Third-party trademarks and tradenames appearing in this document are the Third-party trademarks and tradenames appearing in this document are the
property of their respective owners. Such third-party trademarks have property of their respective owners. Such third-party trademarks have
been printed in caps or initial caps and are used for referential been printed in caps or initial caps and are used for referential

10
doc/source/index.rst
View File

@ -19,12 +19,17 @@ review.
.. toctree:: .. toctree::
:maxdepth: 1 :maxdepth: 1
.. TODO: Add deploy guide once asettle has live link
upgrade-guide/index upgrade-guide/index
developer-docs/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 timeline: https://launchpad.net/openstack-ansible/trunk
.. _Ocata series release notes: http://docs.openstack.org/releasenotes/openstack-ansible/unreleased.html .. _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 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 documentation`_
* `OpenStack-Ansible Newton Deployment Guide`_
* `OpenStack-Ansible Newton series release notes`_ * `OpenStack-Ansible Newton series release notes`_
* `OpenStack-Ansible Newton series timeline`_ * `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 documentation: http://docs.openstack.org/developer/openstack-ansible/newton/
.. _OpenStack-Ansible Newton series timeline: https://launchpad.net/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 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) Mitaka: Security-supported (EOL: 2017-04-10)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~