aboutsummaryrefslogtreecommitdiff
path: root/docs/integration-guide.md
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-06-25 20:36:54 +0000
committerGerrit Code Review <review@openstack.org>2015-06-25 20:36:54 +0000
commit7e2e2a2a61d72fb405b96969eaab66fb8289c51d (patch)
tree411f82786883e03a4f956882dc5f9f51fa555392 /docs/integration-guide.md
parent19420456e9077d75fd9ac7d46f65eb1047779592 (diff)
parent74010ff9869cb6e1232a4aa1a3b8de971c929040 (diff)
downloadkolla-7e2e2a2a61d72fb405b96969eaab66fb8289c51d.tar.gz
kolla-7e2e2a2a61d72fb405b96969eaab66fb8289c51d.zip
Merge "Add neutron-openvswitch-agent contianer"
Diffstat (limited to 'docs/integration-guide.md')
-rwxr-xr-xdocs/integration-guide.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/integration-guide.md b/docs/integration-guide.md
index 0deb75dda..c2bfe3c61 100755
--- a/docs/integration-guide.md
+++ b/docs/integration-guide.md
@@ -102,6 +102,8 @@ all containers. This allows a simple method of ensuring every type of node
NEUTRON_SERVER_SERVICE_HOST=<$HOST_IP> - The IP address/hostname used to commuicate with the Neutron API
NEUTRON_SHARED_SECRET=<sharedsecret> - The shared secret used between Neutron/Nova to secure metadata communication
NEUTRON_API_PASTE_CONFIG=</usr/share/neutron/api-paste.ini> - Location of Neutron's API paste config file
+ NEUTRON_VLAN_NETWORK_NAME=<physnet1> - List of physical_network names with which vlan networks can be created
+ NEUTRON_NETWORK_VLAN_RANGES=<1:1> - Colon seperated range of addresses
TYPE_DRIVERS=<flat,vxlan> - List of network type driver entrypoints to be loaded
TENANT_NETWORK_TYPES=<flat,vxlan> - List of network_types to allocate as tenant networks
MECHANISM_DRIVERS=<linuxbridge,l2population> - List of networking mechanism driver entrypoints to be loaded