openstack/openstack-ansible
Code Issues Proposed changes

Add openstack_user_config reference to Networking Appendix

Browse Source 
In order to expose the contents of the example file in the
documentation, and therefore to search indexing, the contents
of the file are literally included in the Networking Appendix.

Change-Id: I98374e71a578ddbb5704b0177c59b55016ea85c0
This commit is contained in:
Jesse Pretorius 2017-03-06 16:25:25 +00:00
parent a39837aec1
commit f899ee2e0e
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
deploy-guide/source/app-networking.rst
View File

@ -73,8 +73,8 @@ outside world, thanks to dnsmasq (dhcp/dns) + NAT.
If you require additional network configuration for your container interfaces
(like changing the routes on eth1 for routes on the management network),
please adapt your ``openstack_user_config.yml`` file, with the help of the
heavily documented ``openstack_user_config.yml.example`` file.
please adapt your ``openstack_user_config.yml`` file.
See :ref:`openstack-user-config-reference` for more details.
Services running "on metal" (deploying directly on the physical hosts)
@ -103,3 +103,16 @@ The following diagram shows how virtual machines connect to the ``br-vlan`` and
.. image:: figures/networking-compute.png
.. _openstack-user-config-reference:
Reference for openstack_user_config settings
--------------------------------------------
The ``openstack_user_config.yml.example`` file is heavily commented with the
details of how to do more advanced container networking configuration. The
contents of the file are shown here for reference.
.. literalinclude:: ../../etc/openstack_deploy/openstack_user_config.yml.example
:language: yaml
:start-after: under the License.

1
deploy-guide/source/configure.rst
View File

@ -40,6 +40,7 @@ host.
.. note::
The file is heavily commented with details about the various options.
See :ref:`openstack-user-config-reference` for more details.
The configuration in the ``openstack_user_config.yml`` file defines which hosts
run the containers and services deployed by OpenStack-Ansible. For

3
deploy-guide/source/targethosts-networkconfig.rst
View File

@ -22,5 +22,8 @@ The following table shows bridges that are to be configured on hosts.
| | On every compute node | Never |
+-------------+-----------------------+-------------------------------------+
For a detailed reference of how the host and container networking is
implemented, refer to :ref:`network-appendix`.
For use case examples, refer to :ref:`test-environment-config` and
:ref:`production-environment-config`.