openstack/devstack
Code Issues Proposed changes

Merge "Update Neutron section in README"

Browse Source
This commit is contained in:
Jenkins 2015-07-07 18:46:11 +00:00 committed by Gerrit Code Review
commit 68f9172dbd
1 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
README.md
View File

@ -187,7 +187,7 @@ services are started in background and managed by `swift-init` tool.
Basic Setup Basic Setup
In order to enable Neutron a single node setup, you'll need the In order to enable Neutron in a single node setup, you'll need the
following settings in your `local.conf`: following settings in your `local.conf`:
disable_service n-net disable_service n-net
@ -197,47 +197,38 @@ following settings in your `local.conf`:
enable_service q-l3 enable_service q-l3
enable_service q-meta enable_service q-meta
enable_service q-metering enable_service q-metering
# Optional, to enable tempest configuration as part of DevStack
enable_service tempest
Then run `stack.sh` as normal. Then run `stack.sh` as normal.
DevStack supports setting specific Neutron configuration flags to the DevStack supports setting specific Neutron configuration flags to the
service, Open vSwitch plugin and LinuxBridge plugin configuration files. service, ML2 plugin, DHCP and L3 configuration files:
To make use of this feature, the settings can be added to ``local.conf``.
The old ``Q_XXX_EXTRA_XXX_OPTS`` variables are deprecated and will be removed
in the near future. The ``local.conf`` headers for the replacements are:
* ``Q_SRV_EXTRA_OPTS``:
[[post-config|/$Q_PLUGIN_CONF_FILE]] [[post-config|/$Q_PLUGIN_CONF_FILE]]
[linuxbridge] # or [ovs] [ml2]
mechanism_drivers=openvswitch,l2population
Example extra config in `local.conf`:
[[post-config|/$Q_PLUGIN_CONF_FILE]]
[agent]
tunnel_type=vxlan
vxlan_udp_port=8472
[[post-config|$NEUTRON_CONF]] [[post-config|$NEUTRON_CONF]]
[DEFAULT] [DEFAULT]
tenant_network_type=vxlan quota_port=42
DevStack also supports configuring the Neutron ML2 plugin. The ML2 plugin [[post-config|$Q_L3_CONF_FILE]]
can run with the OVS, LinuxBridge, or Hyper-V agents on compute hosts. This [DEFAULT]
is a simple way to configure the ml2 plugin: agent_mode=legacy
[[post-config|$Q_DHCP_CONF_FILE]]
[DEFAULT]
dnsmasq_dns_servers = 8.8.8.8,8.8.4.4
The ML2 plugin can run with the OVS, LinuxBridge, or Hyper-V agents on compute
hosts. This is a simple way to configure the ml2 plugin:
# VLAN configuration # VLAN configuration
Q_PLUGIN=ml2
ENABLE_TENANT_VLANS=True ENABLE_TENANT_VLANS=True
# GRE tunnel configuration # GRE tunnel configuration
Q_PLUGIN=ml2
ENABLE_TENANT_TUNNELS=True ENABLE_TENANT_TUNNELS=True
# VXLAN tunnel configuration # VXLAN tunnel configuration
Q_PLUGIN=ml2
Q_ML2_TENANT_NETWORK_TYPE=vxlan Q_ML2_TENANT_NETWORK_TYPE=vxlan
The above will default in DevStack to using the OVS on each compute host. The above will default in DevStack to using the OVS on each compute host.