openstack/openstack-ansible
Code Issues Proposed changes

Merge "[docs] Address tox errors"

Browse Source
This commit is contained in:
Jenkins 2016-06-28 19:07:51 +00:00 committed by Gerrit Code Review
commit e6d2f771b8
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/source/developer-docs/configure-federation-idp-adfs.rst
View File

@ -35,9 +35,9 @@ Configuring ADFS
References References
~~~~~~~~~~ ~~~~~~~~~~
* `http://blogs.technet.com/b/rmilne/archive/2014/04/28/how-to-install-adfs-2012-r2-for-office-365.aspx`_ * http://blogs.technet.com/b/rmilne/archive/2014/04/28/how-to-install-adfs-2012-r2-for-office-365.aspx
* `http://blog.kloud.com.au/2013/08/14/powershell-deployment-of-web-application-proxy-and-adfs-in-under-10-minutes/`_ * http://blog.kloud.com.au/2013/08/14/powershell-deployment-of-web-application-proxy-and-adfs-in-under-10-minutes/
* `https://ethernuno.wordpress.com/2014/04/20/install-adds-on-windows-server-2012-r2-with-powershell/`_ * https://ethernuno.wordpress.com/2014/04/20/install-adds-on-windows-server-2012-r2-with-powershell/
-------------- --------------

6
doc/source/developer-docs/configure-federation-sp-overview.rst
View File

@ -54,9 +54,9 @@ containers:
References References
---------- ----------
* `http://docs.openstack.org/developer/keystone/configure_federation.html`_ * http://docs.openstack.org/developer/keystone/configure_federation.html
* `http://docs.openstack.org/developer/keystone/extensions/shibboleth.html`_ * http://docs.openstack.org/developer/keystone/extensions/shibboleth.html
* `https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPConfiguration`_ * https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPConfiguration
-------------- --------------

1
doc/source/developer-docs/ops.rst
View File

@ -13,7 +13,6 @@ installed environments.
ops-tips.rst ops-tips.rst
ops-troubleshooting.rst ops-troubleshooting.rst
-------------- --------------
.. include:: navigation.txt .. include:: navigation.txt

6
doc/source/install-guide-revised-draft/targethosts.rst
View File

@ -1,8 +1,8 @@
`Home <index.html>`_ OpenStack-Ansible Installation Guide `Home <index.html>`_ OpenStack-Ansible Installation Guide
======================= ============
Chapter 3. Target hosts Target hosts
======================= ============
.. toctree:: .. toctree::

2
doc/source/install-guide/configure-ironic.rst
View File

@ -28,7 +28,7 @@ OpenStack-Ansible deployment
sed -i '/is_metal.*/d' /etc/openstack_deploy/env.d/nova.yml sed -i '/is_metal.*/d' /etc/openstack_deploy/env.d/nova.yml
Setup a neutron network for use by ironic Setup a neutron network for use by ironic
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In a general case, neutron networking can be a simple flat network. However, In a general case, neutron networking can be a simple flat network. However,
in a complex case, this can be whatever you need and want. Ensure in a complex case, this can be whatever you need and want. Ensure