From db48db1cf0b9c36890439a161424842d07d94f60 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Wed, 6 Apr 2016 08:09:31 -0400 Subject: [PATCH] update docs to reference project not tenant Change-Id: Iad66e14fa33609ea6d2a115469e054762051b964 --- doc/source/configuration.rst | 4 ++-- doc/source/guides/neutron.rst | 21 ++++++++++----------- doc/source/openrc.rst | 2 +- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst index 0493f8fa25..f3e4896296 100644 --- a/doc/source/configuration.rst +++ b/doc/source/configuration.rst @@ -423,8 +423,8 @@ IP Version ---------- ``IP_VERSION`` can be used to configure DevStack to create either an -IPv4, IPv6, or dual-stack tenant data-network by with either -``IP_VERSION=4``, ``IP_VERSION=6``, or ``IP_VERSION=4+6`` +IPv4, IPv6, or dual-stack self service project data-network by with +either ``IP_VERSION=4``, ``IP_VERSION=6``, or ``IP_VERSION=4+6`` respectively. This functionality requires that the Neutron networking service is enabled by setting the following options: diff --git a/doc/source/guides/neutron.rst b/doc/source/guides/neutron.rst index 6ac3993e17..a834314bcc 100644 --- a/doc/source/guides/neutron.rst +++ b/doc/source/guides/neutron.rst @@ -15,8 +15,8 @@ In some instances, like on a developer laptop, there is only one network interface that is available. In this scenario, the physical interface is added to the Open vSwitch bridge, and the IP address of the laptop is migrated onto the bridge interface. That way, the -physical interface can be used to transmit tenant network traffic, -the OpenStack API traffic, and management traffic. +physical interface can be used to transmit self service project +network traffic, the OpenStack API traffic, and management traffic. .. warning:: @@ -222,12 +222,12 @@ it over the `br-ex` bridge, where `eth0` is attached. which is used as the "integration bridge" where ports are created, and plugged into the virtual switching fabric. `br-ex` is an OVS bridge that is used to connect physical ports (like `eth0`), so that floating -IP traffic for tenants can be received from the physical network -infrastructure (and the internet), and routed to tenant network ports. -`br-tun` is a tunnel bridge that is used to connect OpenStack nodes -(like `devstack-2`) together. This bridge is used so that tenant -network traffic, using the VXLAN tunneling protocol, flows between -each compute node where tenant instances run. +IP traffic for project networks can be received from the physical +network infrastructure (and the internet), and routed to self service +project network ports. `br-tun` is a tunnel bridge that is used to +connect OpenStack nodes (like `devstack-2`) together. This bridge is +used so that project network traffic, using the VXLAN tunneling +protocol, flows between each compute node where project instances run. @@ -381,8 +381,8 @@ controller node. ## Neutron options Q_USE_SECGROUP=True - ENABLE_TENANT_VLANS=True - TENANT_VLAN_RANGE=3001:4000 + ENABLE_PROJECT_VLANS=True + PROJECT_VLAN_RANGE=3001:4000 PHYSICAL_NETWORK=default OVS_PHYSICAL_BRIDGE=br-ex @@ -553,4 +553,3 @@ setup, with small modifications for the interface mappings. LB_PHYSICAL_INTERFACE=eth0 PUBLIC_PHYSICAL_NETWORK=default LB_INTERFACE_MAPPINGS=default:eth0 - diff --git a/doc/source/openrc.rst b/doc/source/openrc.rst index 4e7f0754a3..d28b5680c6 100644 --- a/doc/source/openrc.rst +++ b/doc/source/openrc.rst @@ -51,7 +51,7 @@ HOST\_IP, SERVICE\_HOST OS\_AUTH\_URL Authenticating against an OpenStack cloud using Keystone returns a *Token* and *Service Catalog*. The catalog contains the endpoints - for all services the user/tenant has access to - including Nova, + for all services the user/project has access to - including Nova, Glance, Keystone and Swift. ::