aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-04-13 16:55:40 +0000
committerGerrit Code Review <review@openstack.org>2015-04-13 16:55:40 +0000
commitfa789ab8babfd2612289a1e2b0bd00bbbc80a440 (patch)
tree743bf5f35982f57ee6768bb44db027f39b11faee /docs
parent1a7c3e67a2047f0a7c789fe2471b5d65825fb9e1 (diff)
parented107a5e26f35351a178c12eed5cd38c086409db (diff)
downloadkolla-fa789ab8babfd2612289a1e2b0bd00bbbc80a440.tar.gz
kolla-fa789ab8babfd2612289a1e2b0bd00bbbc80a440.zip
Merge "Adds Neutron Agents Support"
Diffstat (limited to 'docs')
-rw-r--r--docs/integration-guide.md5
-rw-r--r--docs/minimal-environment-vars.md12
2 files changed, 17 insertions, 0 deletions
diff --git a/docs/integration-guide.md b/docs/integration-guide.md
index 38a9f6545..869791e23 100644
--- a/docs/integration-guide.md
+++ b/docs/integration-guide.md
@@ -92,6 +92,11 @@ 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
+ 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
+ NEUTRON_FLAT_NETWORK_NAME=<physnet1> - List of physical_network names with which flat networks can be created
+ NEUTRON_FLAT_NETWORK_INTERFACE=<eth1> - List of physical interface names that connect to physical_networks
HEAT_DB_NAME=<heat> - The heat DB name
HEAT_DB_PASSWORD=<kolla> - The heat db password
HEAT_KEYSTONE_PASSWORD=<heat> - The keystone password for the heat user
diff --git a/docs/minimal-environment-vars.md b/docs/minimal-environment-vars.md
index 710ea443a..c681baa76 100644
--- a/docs/minimal-environment-vars.md
+++ b/docs/minimal-environment-vars.md
@@ -148,6 +148,7 @@ In order for each service to function, there is a minimum set of required variab
NOVA_API_SERVICE_HOST
NOVA_EC2_API_SERVICE_HOST
NOVA_EC2_SERVICE_HOST
+ NOVA_METADATA_API_SERVICE_HOST
PUBLIC_IP
# Nova-compute
@@ -245,3 +246,14 @@ In order for each service to function, there is a minimum set of required variab
NEUTRON_KEYSTONE_PASSWORD
NEUTRON_SERVER_SERVICE_HOST
NEUTRON_API_PASTE_CONFIG
+
+# Neutron ML2 PLugin
+
+ TYPE_DRIVERS
+ TENANT_NETWORK_TYPES
+ MECHANISM_DRIVERS
+
+# Neutron Linux Bridge Plugin
+
+ NEUTRON_FLAT_NETWORK_NAME
+ NEUTRON_FLAT_NETWORK_INTERFACE