diff options
| author | Daneyon Hansen <danehans@cisco.com> | 2015-04-07 19:34:40 +0000 |
|---|---|---|
| committer | Daneyon Hansen <danehans@cisco.com> | 2015-04-13 07:34:12 +0000 |
| commit | ed107a5e26f35351a178c12eed5cd38c086409db (patch) | |
| tree | c4b0c9868d79e86d8c14b9f04cb054f645babcb9 /tools | |
| parent | 2f2bb366e0aa856803c0d21a7a541802d814d180 (diff) | |
| download | kolla-ed107a5e26f35351a178c12eed5cd38c086409db.tar.gz kolla-ed107a5e26f35351a178c12eed5cd38c086409db.zip | |
Adds Neutron Agents Support
Previously, the agents ran in seperate containers. Since some of
the agents create and use network namespaces, runnning them in
seperate containers has become a challenge. This patch adds
neutron agent support in a single container.
Partially Implements: blueprint compute-operation-neutron
Change-Id: If4f893abd50d90b58e8435ec2659870dce36951c
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/genenv | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/tools/genenv b/tools/genenv index 0f3226036..c7748b225 100755 --- a/tools/genenv +++ b/tools/genenv @@ -32,7 +32,8 @@ ADMIN_TENANT_NAME=admin PUBLIC_IP=$HOST_IP # Logging -DEBUG_LOGGING=false +#DEBUG_LOGGING=false +DEBUG_LOGGING=true VERBOSE_LOGGING=true NOVA_LOG_DIR= NEUTRON_LOG_DIR= @@ -77,16 +78,13 @@ NOVA_DB_USER=nova NOVA_KEYSTONE_USER=nova NOVA_KEYSTONE_PASSWORD=nova NOVA_API_SERVICE_HOST=$HOST_IP +NOVA_METADATA_API_SERVICE_HOST=$HOST_IP NOVA_EC2_SERVICE_HOST=$HOST_IP NOVA_PUBLIC_INTERFACE=$MY_DEV NOVA_FLAT_INTERFACE=eth1 ENABLED_APIS=ec2,osapi_compute,metadata METADATA_HOST=$HOST_IP -# Neutron Linux Bridge Agent -NEUTRON_FLAT_NETWORK_NAME=physnet1 -NEUTRON_FLAT_NETWORK_INTERFACE=eth1 - # Neutron NEUTRON_DB_NAME=neutron NEUTRON_DB_USER=neutron @@ -95,6 +93,13 @@ NEUTRON_KEYSTONE_USER=neutron NEUTRON_KEYSTONE_PASSWORD=neutron NEUTRON_SERVER_SERVICE_HOST=$HOST_IP NEUTRON_API_PASTE_CONFIG=/usr/share/neutron/api-paste.ini +# Neutron ML2 Plugin +TYPE_DRIVERS=flat,vxlan +TENANT_NETWORK_TYPES=flat,vxlan +MECHANISM_DRIVERS=linuxbridge,l2population +# Neutron Linux Bridge Agent +NEUTRON_FLAT_NETWORK_NAME=physnet1 +NEUTRON_FLAT_NETWORK_INTERFACE=eth1 # Nova/Neutron NEUTRON_SHARED_SECRET=sharedsecret @@ -126,6 +131,9 @@ NEUTRON_SERVER_LOG_FILE=$NEUTRON_SERVER_LOG_FILE NEUTRON_L3_AGENT_LOG_FILE=$NEUTRON_L3_AGENT_LOG_FILE NEUTRON_LINUXBRIDGE_AGENT_LOG_FILE=$NEUTRON_LINUXBRIDGE_AGENT_LOG_FILE NEUTRON_METADATA_AGENT_LOG_FILE=$NEUTRON_METADATA_AGENT_LOG_FILE +TYPE_DRIVERS=$TYPE_DRIVERS +TENANT_NETWORK_TYPES=$TENANT_NETWORK_TYPES +MECHANISM_DRIVERS=$MECHANISM_DRIVERS ADMIN_USER_PASSWORD=$ADMIN_USER_PASSWORD ADMIN_TENANT_NAME=$ADMIN_TENANT_NAME DB_ROOT_PASSWORD=$MARIADB_ROOT_PASSWORD @@ -148,6 +156,7 @@ MARIADB_SERVICE_HOST=$HOST_IP MARIADB_ROOT_PASSWORD=$MARIADB_ROOT_PASSWORD NETWORK_MANAGER=$NETWORK_MANAGER NOVA_API_SERVICE_HOST=$NOVA_API_SERVICE_HOST +NOVA_METADATA_API_SERVICE_HOST=$NOVA_METADATA_API_SERVICE_HOST ENABLED_APIS=$ENABLED_APIS METADATA_HOST=$METADATA_HOST NOVA_DB_NAME=$NOVA_DB_NAME @@ -165,6 +174,8 @@ NEUTRON_KEYSTONE_USER=$NEUTRON_KEYSTONE_USER NEUTRON_KEYSTONE_PASSWORD=$NEUTRON_KEYSTONE_PASSWORD NEUTRON_SERVER_SERVICE_HOST=$NEUTRON_SERVER_SERVICE_HOST NEUTRON_API_PASTE_CONFIG=$NEUTRON_API_PASTE_CONFIG +NEUTRON_FLAT_NETWORK_NAME=$NEUTRON_FLAT_NETWORK_NAME +NEUTRON_FLAT_NETWORK_INTERFACE=$NEUTRON_FLAT_NETWORK_INTERFACE HEAT_DB_NAME=$HEAT_DB_NAME HEAT_DB_PASSWORD=$HEAT_DB_PASSWORD HEAT_KEYSTONE_PASSWORD=$HEAT_KEYSTONE_PASSWORD |