Update documentation for multiple VLAN ranges

Update example configuration file and installation guide to
mention support for multiple VLAN ranges on a particular
network and provide examples. Also address other minor
issues with networking content in the installation guide.

Change-Id: Idca97092f326cfbd83a018e853d3e7655d20e491
Partial-Bug: #1475436

doc/source/install-guide/configure-networking.rst

@@ -93,7 +93,25 @@ configure target host networking.
    Replace *``TUNNEL_BRIDGE``* with the tunnel/overlay bridge device
    name, typically ``br-vxlan``.
 
-#. Configure optional networks in the ``provider_networks`` subsection:
+#. Configure the management network in the ``provider_networks`` subsection:
+
+   .. code-block:: yaml
+
+         provider_networks:
+           - network:
+               group_binds:
+                 - all_containers
+                 - hosts
+               type: "raw"
+               container_bridge: "br-mgmt"
+               container_interface: "eth1"
+               container_type: "veth"
+               ip_from_q: "management"
+               is_container_address: true
+               is_ssh_address: true
+
+#. Configure optional networks in the ``provider_networks`` subsection. For
+   example, a storage network:
 
    .. code-block:: yaml
 
@@ -106,6 +124,7 @@ configure target host networking.
                  - nova_compute
                type: "raw"
                container_bridge: "br-storage"
+               container_type: "veth"
                container_interface: "eth2"
                ip_from_q: "storage"
 
@@ -113,7 +132,7 @@ configure target host networking.
    networks. To remove one or both of them, comment out the entire
    associated stanza beginning with the *- network:* line.
 
-#. Configure OpenStack Networking tunnel/overlay network in the
+#. Configure OpenStack Networking VXLAN tunnel/overlay networks in the
    ``provider_networks`` subsection:
 
    .. code-block:: yaml
@@ -123,6 +142,7 @@ configure target host networking.
                group_binds:
                  - neutron_linuxbridge_agent
                container_bridge: "br-vxlan"
+               container_type: "veth"
                container_interface: "eth10"
                ip_from_q: "tunnel"
                type: "vxlan"
@@ -132,8 +152,8 @@ configure target host networking.
    Replace *``TUNNEL_ID_RANGE``* with the tunnel ID range. For example,
    1:1000.
 
-#. Configure OpenStack Networking provider networks in the
-   ``provider_networks`` subsection:
+#. Configure OpenStack Networking flat (untagged) and VLAN (tagged) networks
+   in the ``provider_networks`` subsection:
 
    .. code-block:: yaml
 
@@ -142,21 +162,25 @@ configure target host networking.
                group_binds:
                  - neutron_linuxbridge_agent
                container_bridge: "br-vlan"
-               container_interface: "eth11"
+               container_type: "veth"
+               container_interface: "eth12"
+               host_bind_override: "eth12"
                type: "flat"
-               net_name: "vlan"
+               net_name: "flat"
            - network:
                group_binds:
                  - neutron_linuxbridge_agent
                container_bridge: "br-vlan"
+               container_type: "veth"
                container_interface: "eth11"
                type: "vlan"
                range: VLAN_ID_RANGE
                net_name: "vlan"
 
-   Replace *``VLAN_ID_RANGE``* with the VLAN ID range for each VLAN
-   provider network. For example, 1:1000. Create a similar stanza for
-   each additional provider network.
+   Replace *``VLAN_ID_RANGE``* with the VLAN ID range for each VLAN network.
+   For example, 1:1000. Supports more than one range of VLANs on a particular
+   network. For example, 1:1000,2001:3000. Create a similar stanza for each
+   additional network.
 
 .. note::
 

etc/openstack_deploy/openstack_user_config.yml.example

@@ -172,8 +172,9 @@
 #
 #       Option: range (optional, string)
 #       For 'vxlan' type neutron networks, range of VXLAN network identifiers
-#       (VNI). For 'vlan' type neutron networks, range of VLAN tags. Coincides
-#       with ML2 plug-in configuration options.
+#       (VNI). For 'vlan' type neutron networks, range of VLAN tags. Supports
+#       more than one range of VLANs on a particular network. Coincides with
+#       ML2 plug-in configuration options.
 #
 #   Example:
 #
@@ -192,9 +193,9 @@
 #     'eth10' device in containers. Applies to all neutron agent containers
 #     and neutron agents on bare metal hosts.
 #   - Network of type 'vlan' that contains neutron VLAN networks 101 to 200
-#     and uses the 'br-vlan' bridge on target hosts. Maps to the 'eth11' device
-#     in containers. Applies to all neutron agent containers and neutron agents
-#     on bare metal hosts.
+#     and 301 to 400 and uses the 'br-vlan' bridge on target hosts. Maps to
+#     the 'eth11' device in containers. Applies to all neutron agent
+#     containers and neutron agents on bare metal hosts.
 #   - Network of type 'flat' that contains one neutron flat network and uses
 #     the 'br-vlan' bridge on target hosts. Maps to the 'eth12' device in
 #     containers. Applies to all neutron agent containers and neutron agents
@@ -249,7 +250,7 @@
 #         container_type: "veth"
 #         container_interface: "eth11"
 #         type: "vlan"
-#         range: "101:200"
+#         range: "101:200,301:400"
 #         net_name: "vlan"
 #     - network:
 #         group_binds: