From 8edbd3e8387bc446c1f66ffe71c783d1aa269635 Mon Sep 17 00:00:00 2001 From: Sam Betts Date: Tue, 31 Oct 2017 13:52:19 +0000 Subject: [PATCH] Reword interface information in multitenancy docs There has been some confusion about the difference between the flat and neutron network interfaces. This patch aims to improve the descriptions of those interfaces to explain the differences and behaviours better. Change-Id: I4697fcb3d2c7865fbe7b886ea6c51c1b5cfbea2f --- doc/source/admin/multitenancy.rst | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/doc/source/admin/multitenancy.rst b/doc/source/admin/multitenancy.rst index 7ab676ed79..e642f7baa3 100644 --- a/doc/source/admin/multitenancy.rst +++ b/doc/source/admin/multitenancy.rst @@ -27,12 +27,16 @@ the Bare Metal service: - ``noop`` interface is used for standalone deployments, and does not perform any network switching; -- ``flat`` interface places all provisioned nodes and nodes being deployed into - a single layer 2 network, separated from the cleaning network; +- ``flat`` interface places all nodes into a single provider network that is + pre-configured on the Networking service and physical equipment. Nodes remain + physically connected to this network during their entire life cycle. -- ``neutron`` interface provides tenant-defined networking by integrating with - the Networking service, while also separating tenant networks from the - provisioning and cleaning provider networks. +- ``neutron`` interface provides tenant-defined networking through the + Networking service, separating tenant networks from each other and from the + provisioning and cleaning provider networks. Nodes will move between these + networks during their life cycle. This interface requires Networking service + support for the switches attached to the baremetal servers so they can be + programmed. Local link connection ---------------------