openstack/devstack
Code Issues Proposed changes

Merge "update docs to reference project not tenant"

Browse Source
This commit is contained in:
Jenkins 2016-04-13 23:36:42 +00:00 committed by Gerrit Code Review
commit a5bc067991
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/configuration.rst
View File

@ -423,8 +423,8 @@ IP Version
---------- ----------
``IP_VERSION`` can be used to configure DevStack to create either an ``IP_VERSION`` can be used to configure DevStack to create either an
IPv4, IPv6, or dual-stack tenant data-network by with either IPv4, IPv6, or dual-stack self service project data-network by with
``IP_VERSION=4``, ``IP_VERSION=6``, or ``IP_VERSION=4+6`` either ``IP_VERSION=4``, ``IP_VERSION=6``, or ``IP_VERSION=4+6``
respectively. This functionality requires that the Neutron networking respectively. This functionality requires that the Neutron networking
service is enabled by setting the following options: service is enabled by setting the following options:

21
doc/source/guides/neutron.rst
View File

@ -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 network interface that is available. In this scenario, the physical
interface is added to the Open vSwitch bridge, and the IP address of interface is added to the Open vSwitch bridge, and the IP address of
the laptop is migrated onto the bridge interface. That way, the the laptop is migrated onto the bridge interface. That way, the
physical interface can be used to transmit tenant network traffic, physical interface can be used to transmit self service project
the OpenStack API traffic, and management traffic. network traffic, the OpenStack API traffic, and management traffic.
.. warning:: .. 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 which is used as the "integration bridge" where ports are created, and
plugged into the virtual switching fabric. `br-ex` is an OVS bridge plugged into the virtual switching fabric. `br-ex` is an OVS bridge
that is used to connect physical ports (like `eth0`), so that floating that is used to connect physical ports (like `eth0`), so that floating
IP traffic for tenants can be received from the physical network IP traffic for project networks can be received from the physical
infrastructure (and the internet), and routed to tenant network ports. network infrastructure (and the internet), and routed to self service
`br-tun` is a tunnel bridge that is used to connect OpenStack nodes project network ports. `br-tun` is a tunnel bridge that is used to
(like `devstack-2`) together. This bridge is used so that tenant connect OpenStack nodes (like `devstack-2`) together. This bridge is
network traffic, using the VXLAN tunneling protocol, flows between used so that project network traffic, using the VXLAN tunneling
each compute node where tenant instances run. protocol, flows between each compute node where project instances run.
@ -381,8 +381,8 @@ controller node.
## Neutron options ## Neutron options
Q_USE_SECGROUP=True Q_USE_SECGROUP=True
ENABLE_TENANT_VLANS=True ENABLE_PROJECT_VLANS=True
TENANT_VLAN_RANGE=3001:4000 PROJECT_VLAN_RANGE=3001:4000
PHYSICAL_NETWORK=default PHYSICAL_NETWORK=default
OVS_PHYSICAL_BRIDGE=br-ex OVS_PHYSICAL_BRIDGE=br-ex
@ -553,4 +553,3 @@ setup, with small modifications for the interface mappings.
LB_PHYSICAL_INTERFACE=eth0 LB_PHYSICAL_INTERFACE=eth0
PUBLIC_PHYSICAL_NETWORK=default PUBLIC_PHYSICAL_NETWORK=default
LB_INTERFACE_MAPPINGS=default:eth0 LB_INTERFACE_MAPPINGS=default:eth0

2
doc/source/openrc.rst
View File

@ -51,7 +51,7 @@ HOST\_IP, SERVICE\_HOST
OS\_AUTH\_URL OS\_AUTH\_URL
Authenticating against an OpenStack cloud using Keystone returns a Authenticating against an OpenStack cloud using Keystone returns a
*Token* and *Service Catalog*. The catalog contains the endpoints *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. Glance, Keystone and Swift.
:: ::