diff --git a/doc/install-guide/source/environment-networking-compute.rst b/doc/install-guide/source/environment-networking-compute.rst index e8f8ec21bd..54a789264b 100644 --- a/doc/install-guide/source/environment-networking-compute.rst +++ b/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 - address assigned to it. Configure the second interface as the public +#. The provider interface uses a special configuration without an IP + 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 diff --git a/doc/install-guide/source/environment-networking-controller.rst b/doc/install-guide/source/environment-networking-controller.rst index 0dc9035c7d..495be9289d 100644 --- a/doc/install-guide/source/environment-networking-controller.rst +++ b/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 - address assigned to it. Configure the second interface as the public +#. The provider interface uses a special configuration without an IP + 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 diff --git a/doc/install-guide/source/environment-networking.rst b/doc/install-guide/source/environment-networking.rst index 02905aff8d..c79200efbf 100644 --- a/doc/install-guide/source/environment-networking.rst +++ b/doc/install-guide/source/environment-networking.rst @@ -44,13 +44,15 @@ To highlight the importance of network separation, the example architectures use `private address space `__ 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 -assume that the physical network infrastructure provides direct Internet -access. In the provider networks architecture, all instances attach directly -to the public network. In the self-service networks architecture, instances -can attach to a private or public network. Private networks can reside -entirely within OpenStack or provide some level of public network access -using :term:`NAT`. +architectures use routable IP address space for the provider (external) +network and assume that the physical network infrastructure provides direct +Internet access. + +In the provider networks architecture, all instances attach directly +to the provider network. In the self-service (private) networks architecture, +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: @@ -65,7 +67,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. diff --git a/doc/install-guide/source/environment.rst b/doc/install-guide/source/environment.rst index 221b07f275..f87ca17812 100644 --- a/doc/install-guide/source/environment.rst +++ b/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 diff --git a/doc/install-guide/source/figures/hwreqs.graffle b/doc/install-guide/source/figures/hwreqs.graffle index 00b925c9c4..40a7263216 100644 Binary files a/doc/install-guide/source/figures/hwreqs.graffle and b/doc/install-guide/source/figures/hwreqs.graffle differ diff --git a/doc/install-guide/source/figures/hwreqs.png b/doc/install-guide/source/figures/hwreqs.png index df225d2605..9f43310046 100644 Binary files a/doc/install-guide/source/figures/hwreqs.png and b/doc/install-guide/source/figures/hwreqs.png differ diff --git a/doc/install-guide/source/figures/hwreqs.svg b/doc/install-guide/source/figures/hwreqs.svg index 764c63dc6e..09e236fb8a 100644 --- a/doc/install-guide/source/figures/hwreqs.svg +++ b/doc/install-guide/source/figures/hwreqs.svg @@ -1,3 +1,3 @@ - + - Produced by OmniGraffle 6.0.5 2015-09-08 20:16ZCanvas 1Layer 1Controller NodeCompute Node 11-2CPUBlock Storage Node 1Object Storage Node 1Object Storage Node 2Hardware RequirementsCore componentOptional component8 GBRAM100 GBStorage2-4+CPU8+ GBRAM100+ GBStorage1-2CPU2 GBRAM2NIC2NIC1NIC1NIC4+ GBRAM1-2CPU1NIC100+ GBStorage100+ GBStorage100+ GBStorage/dev/sdb/dev/sdb/dev/sdc/dev/sdb/dev/sdc1-2CPU4+ GBRAM + Produced by OmniGraffle 6.5.1 2016-03-07 18:27:09 +0000Canvas 1Layer 1Controller NodeCompute Node 11-2CPUBlock Storage Node 1Object Storage Node 1Object Storage Node 2Hardware RequirementsCore componentOptional component8 GBRAM100 GBStorage2-4+CPU8+ GBRAM100+ GBStorage1-2CPU4 GBRAM2NIC2NIC1NIC1NIC4+ GBRAM1-2CPU1NIC100+ GBStorage100+ GBStorage100+ GBStorage/dev/sdb/dev/sdb/dev/sdc/dev/sdb/dev/sdc1-2CPU4+ GBRAM diff --git a/doc/install-guide/source/figures/network1-services.graffle b/doc/install-guide/source/figures/network1-services.graffle index 22c30c735d..99882f5149 100644 Binary files a/doc/install-guide/source/figures/network1-services.graffle and b/doc/install-guide/source/figures/network1-services.graffle differ diff --git a/doc/install-guide/source/figures/network1-services.png b/doc/install-guide/source/figures/network1-services.png index 558458aaca..0c55faaeb6 100644 Binary files a/doc/install-guide/source/figures/network1-services.png and b/doc/install-guide/source/figures/network1-services.png differ diff --git a/doc/install-guide/source/figures/network1-services.svg b/doc/install-guide/source/figures/network1-services.svg index 33b65ca5d7..142bf6998b 100644 --- a/doc/install-guide/source/figures/network1-services.svg +++ b/doc/install-guide/source/figures/network1-services.svg @@ -1,3 +1,3 @@ - + - Produced by OmniGraffle 6.0.5 2015-09-15 17:09ZCanvas 1Layer 1 Controller NodeSQL DatabaseServiceBlock Storage Nodes Object Storage NodesNetworking Option 1: Provider NetworksService LayoutCore componentOptional componentMessage QueueIdentityImage ServiceComputeManagementNetworkingManagementBlock StorageManagementNetwork Time ServiceOrchestrationTelemetryManagementObject StorageProxy ServiceNetworkingDHCP Agent Compute NodesKVM HypervisorComputeNetworkingLinux Bridge AgentTelemetryAgentTelemetryAgent(s)NetworkingML2 Plug-inObject StorageAccount ServiceObject StorageContainer ServiceObject StorageObject ServiceBlock StorageVolume ServiceTelemetryAgentiSCSI TargetServiceNetworkingLinux Bridge AgentLinux NetworkUtilitiesLinux NetworkUtilities + Produced by OmniGraffle 6.5.1 2016-03-07 18:27:39 +0000Canvas 1Layer 1 Controller NodeSQL DatabaseServiceBlock Storage Nodes Object Storage NodesNetworking Option 1: Provider NetworksService LayoutCore componentOptional componentMessage QueueIdentityImage ServiceComputeManagementNetworkingManagementBlock StorageManagementNetwork Time ServiceOrchestrationTelemetryManagementObject StorageProxy ServiceNetworkingDHCP Agent Compute NodesKVM HypervisorComputeNetworkingLinux Bridge AgentTelemetryAgentTelemetryAgent(s)NetworkingML2 Plug-inObject StorageAccount ServiceObject StorageContainer ServiceObject StorageObject ServiceBlock StorageVolume ServiceTelemetryAgentiSCSI TargetServiceNetworkingLinux Bridge AgentLinux NetworkUtilitiesLinux NetworkUtilitiesShared File SystemServiceShared File SystemManagementNoSQL DatabaseServiceNetworkingMetadata Agent diff --git a/doc/install-guide/source/figures/network2-services.graffle b/doc/install-guide/source/figures/network2-services.graffle index f90342e4d0..38212407cd 100644 Binary files a/doc/install-guide/source/figures/network2-services.graffle and b/doc/install-guide/source/figures/network2-services.graffle differ diff --git a/doc/install-guide/source/figures/network2-services.png b/doc/install-guide/source/figures/network2-services.png index f0cb5cfea4..49213235ed 100644 Binary files a/doc/install-guide/source/figures/network2-services.png and b/doc/install-guide/source/figures/network2-services.png differ diff --git a/doc/install-guide/source/figures/network2-services.svg b/doc/install-guide/source/figures/network2-services.svg index 7266ac0108..07173be7eb 100644 --- a/doc/install-guide/source/figures/network2-services.svg +++ b/doc/install-guide/source/figures/network2-services.svg @@ -1,3 +1,3 @@ - + - Produced by OmniGraffle 6.0.5 2015-09-15 17:09ZCanvas 1Layer 1 Controller NodeSQL DatabaseServiceBlock Storage Nodes Object Storage NodesNetworking Option 2: Self-Service NetworksService LayoutCore componentOptional componentMessage QueueIdentityImage ServiceComputeManagementNetworkingManagementBlock StorageManagementNetwork Time ServiceOrchestrationTelemetryManagementObject StorageProxy ServiceNetworkingL3 AgentNetworkingDHCP Agent Compute NodesKVM HypervisorComputeNetworkingLinux Bridge AgentTelemetryAgentTelemetryAgent(s)NetworkingML2 Plug-inObject StorageAccount ServiceObject StorageContainer ServiceObject StorageObject ServiceBlock StorageVolume ServiceTelemetryAgentiSCSI TargetServiceNetworkingMetadata AgentNetworkingLinux Bridge AgentLinux NetworkUtilitiesLinux NetworkUtilities + Produced by OmniGraffle 6.5.1 2016-03-07 18:28:40 +0000Canvas 1Layer 1 Controller NodeSQL DatabaseServiceBlock Storage Nodes Object Storage NodesNetworking Option 2: Self-Service NetworksService LayoutCore componentOptional componentMessage QueueIdentityImage ServiceComputeManagementNetworkingManagementBlock StorageManagementNetwork Time ServiceOrchestrationTelemetryManagementObject StorageProxy ServiceNetworkingL3 AgentNetworkingDHCP Agent Compute NodesKVM HypervisorComputeNetworkingLinux Bridge AgentTelemetryAgentTelemetryAgent(s)NetworkingML2 Plug-inObject StorageAccount ServiceObject StorageContainer ServiceObject StorageObject ServiceBlock StorageVolume ServiceShared File SystemServiceiSCSI TargetServiceNetworkingMetadata AgentNetworkingLinux Bridge AgentLinux NetworkUtilitiesLinux NetworkUtilitiesShared File SystemManagementTelemetryAgentNoSQL DatabaseService diff --git a/doc/install-guide/source/figures/networklayout.graffle b/doc/install-guide/source/figures/networklayout.graffle index abd6f333fa..db7a035d1d 100644 Binary files a/doc/install-guide/source/figures/networklayout.graffle and b/doc/install-guide/source/figures/networklayout.graffle differ diff --git a/doc/install-guide/source/figures/networklayout.png b/doc/install-guide/source/figures/networklayout.png index ad744aae2f..9f0913062a 100644 Binary files a/doc/install-guide/source/figures/networklayout.png and b/doc/install-guide/source/figures/networklayout.png differ diff --git a/doc/install-guide/source/figures/networklayout.svg b/doc/install-guide/source/figures/networklayout.svg index 1eee954732..2361669c41 100644 --- a/doc/install-guide/source/figures/networklayout.svg +++ b/doc/install-guide/source/figures/networklayout.svg @@ -1,3 +1,3 @@ - + - Produced by OmniGraffle 6.0.5 2015-09-15 17:31ZCanvas 1Layer 1 Controller Node 1 Compute Node 1Network LayoutManagement network10.0.0.0/24Public network203.0.113.0/24 Block Storage Node 1 Object Storage Node 2 Object Storage Node 1Interface 2(unnumbered)Interface 2(unnumbered)InternetInterface 110.0.0.11/24Interface 110.0.0.31/24Interface 110.0.0.41/24Interface 110.0.0.61/24Interface 110.0.0.51/24NATCore componentOptional component + Produced by OmniGraffle 6.5.1 2016-03-07 18:28:15 +0000Canvas 1Layer 1 Controller Node 1 Compute Node 1Network LayoutManagement network10.0.0.0/24Provider network203.0.113.0/24 Block Storage Node 1 Object Storage Node 2 Object Storage Node 1Interface 2(unnumbered)Interface 2(unnumbered)InternetInterface 110.0.0.11/24Interface 110.0.0.31/24Interface 110.0.0.41/24Interface 110.0.0.61/24Interface 110.0.0.51/24NATCore componentOptional component diff --git a/doc/install-guide/source/overview.rst b/doc/install-guide/source/overview.rst index 71dc7e8380..edd400f962 100644 --- a/doc/install-guide/source/overview.rst +++ b/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.