Merge "Install: Environment updates for Mitaka"

doc/install-guide/source/environment-networking-compute.rst

@@ -16,8 +16,8 @@ Configure network interfaces
 
       Additional compute nodes should use 10.0.0.32, 10.0.0.33, and so on.
 
-#. The public interface uses a special configuration without an IP
+#. The provider interface uses a special configuration without an IP
-   address assigned to it. Configure the second interface as the public
+   address assigned to it. Configure the second interface as the provider
    interface:
 
    Replace ``INTERFACE_NAME`` with the actual interface name. For example,
@@ -29,7 +29,7 @@ Configure network interfaces
 
         .. code-block:: ini
 
-           # The public network interface
+           # The provider network interface
            auto INTERFACE_NAME
            iface  INTERFACE_NAME inet manual
            up ip link set dev $IFACE up

doc/install-guide/source/environment-networking-controller.rst

@@ -12,8 +12,8 @@ Configure network interfaces
 
    Default gateway: 10.0.0.1
 
-#. The public interface uses a special configuration without an IP
+#. The provider interface uses a special configuration without an IP
-   address assigned to it. Configure the second interface as the public
+   address assigned to it. Configure the second interface as the provider
    interface:
 
    Replace ``INTERFACE_NAME`` with the actual interface name. For example,
@@ -25,9 +25,9 @@ Configure network interfaces
 
         .. code-block:: ini
 
-           # The public network interface
+           # The provider network interface
            auto INTERFACE_NAME
-           iface  INTERFACE_NAME inet manual
+           iface INTERFACE_NAME inet manual
            up ip link set dev $IFACE up
            down ip link set dev $IFACE down
 

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

@@ -46,13 +46,15 @@ To highlight the importance of network separation, the example architectures
 use `private address space <https://tools.ietf.org/html/rfc1918>`__ for the
 management network and assume that the physical network infrastructure
 provides Internet access via :term:`NAT` or other method. The example
-architectures use routable IP address space for the public network and
+architectures use routable IP address space for the provider (external)
-assume that the physical network infrastructure provides direct Internet
+network and assume that the physical network infrastructure provides direct
-access. In the provider networks architecture, all instances attach directly
+Internet access.
-to the public network. In the self-service networks architecture, instances
+
-can attach to a private or public network. Private networks can reside
+In the provider networks architecture, all instances attach directly
-entirely within OpenStack or provide some level of public network access
+to the provider network. In the self-service (private) networks architecture,
-using :term:`NAT`.
+instances can attach to a self-service or provider network. Self-service
+networks can reside entirely within OpenStack or provide some level of external
+network access using :term:`NAT` through the provider network.
 
 .. _figure-networklayout:
 
@@ -67,7 +69,7 @@ The example architectures assume use of the following networks:
   nodes for administrative purposes such as package installation,
   security updates, :term:`DNS`, and :term:`NTP`.
 
-* Public on 203.0.113.0/24 with gateway 203.0.113.1
+* Provider on 203.0.113.0/24 with gateway 203.0.113.1
 
   This network requires a gateway to provide Internet access to
   instances in your OpenStack environment.

doc/install-guide/source/environment.rst

@@ -64,7 +64,7 @@ of nested VMs.
 .. note::
 
    If you choose to install on VMs, make sure your hypervisor provides
-   a way to disable MAC address filtering on the ``public`` network
+   a way to disable MAC address filtering on the provider network
    interface.
 
 For more information about system requirements, see the `OpenStack

doc/install-guide/source/overview.rst

@@ -118,7 +118,7 @@ follows:
 * Networking agents reside on the controller node instead of one or more
   dedicated network nodes.
 
-* Overlay (tunnel) traffic for private networks traverses the management
+* Overlay (tunnel) traffic for self-service networks traverses the management
   network instead of a dedicated network.
 
 For more information on production architectures, see the
@@ -205,7 +205,7 @@ IP address information to instances.
 
 .. note::
 
-   This option lacks support for self-service private networks, layer-3
+   This option lacks support for self-service (private) networks, layer-3
    (routing) services, and advanced services such as :term:`LBaaS` and
    :term:`FWaaS`. Consider the self-service networks option if you
    desire these features.