Merge "Clarifications and doc improvements"

doc/source/configure-octavia.rst

@@ -24,23 +24,29 @@ OpenStack-Ansible deployment
 Setup a neutron network for use by octavia
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-In a general case, neutron networking can be a simple flat network. However,
+Octavia needs connectivity between the control plane and the
-in a complex case, this can be whatever you need and want. Ensure
+load balancing VMs. For this purpose a provide rnetwork should be
-you adjust the deployment accordingly. The following is an example:
+created which bridges containers (if the control plane is installed
+in a container) or hosts with vms. Refer to the appropriate documentation
+and consult the tests in this project. 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 you adjust the deployment accordingly. The following
+is an example how to set it up in neutron:
 
 
 .. code-block:: bash
 
-    neutron net-create cleaning-net --shared \
+    neutron net-create mgmt-net --shared \
                                     --provider:network_type flat \
                                     --provider:physical_network mgmt
 
-    neutron subnet-create ironic-net 172.19.0.0/22 --name mgmt-subnet
+    neutron subnet-create mgmt-net 172.19.0.0/22 --name mgmt-subnet
                           --ip-version=4 \
                           --allocation-pool start=172.19.1.100,end=172.19.1.200 \
                           --enable-dhcp \
                           --dns-nameservers list=true 8.8.4.4 8.8.8.8
 
+
 Building Octavia images
 ~~~~~~~~~~~~~~~~~~~~~~~
 

tests/host_vars/localhost.yml

@@ -19,6 +19,8 @@ ansible_python_interpreter: "/usr/bin/python2"
 bridges:
   - name: "br-mgmt"
     ip_addr: "10.1.1.1"
+    # Use container mgmt as Octavia mgmt net
+    # set up veth pair to connect with Neutron
     veth_peer: "eth14"
   - name: "br-vxlan"
     ip_addr: "10.1.2.1"