From 40be5646fa374260a4c7cac9d8d0b069ed453c65 Mon Sep 17 00:00:00 2001
From: Daneyon Hansen <danehans@cisco.com>
Date: Fri, 27 Mar 2015 23:36:06 +0000
Subject: Partially Implements: Container set compute-operation-neutron

Adds the neutron-linuxbridge-agent to the neutron container set.

Change-Id: I20752611c24a3110cc5d2e4fca2d501fc32a4d87
---
 docker/neutron/agents/linux-bridge/start.sh | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'docker')

diff --git a/docker/neutron/agents/linux-bridge/start.sh b/docker/neutron/agents/linux-bridge/start.sh
index 727db24b5..1aeea4cf5 100755
--- a/docker/neutron/agents/linux-bridge/start.sh
+++ b/docker/neutron/agents/linux-bridge/start.sh
@@ -5,18 +5,14 @@ set -e
 . /opt/kolla/config-neutron.sh
 . /sudoers.sh
 
-: ${BRIDGE_PHYSICAL_INTERFACE:=eth1}
-: ${ML2_FLAT_NETWORK:=physnet1}
+: ${NEUTRON_FLAT_NETWORK_NAME:=physnet1}
+: ${NEUTRON_FLAT_NETWORK_INTERFACE:=eth1}
 
 check_required_vars PUBLIC_IP
 
 cfg=/etc/neutron/plugins/ml2/ml2_conf.ini
 
 # Configure ml2_conf.ini
-crudini --set $cfg \
-        ml2_type_flat \
-        flat_networks \
-        "${ML2_FLAT_NETWORK}"
 crudini --set $cfg \
         vxlan \
         local_ip \
@@ -24,7 +20,7 @@ crudini --set $cfg \
 crudini --set $cfg \
         linux_bridge \
         physical_interface_mappings \
-        "${ML2_FLAT_NETWORK}:${BRIDGE_PHYSICAL_INTERFACE}"
+        "${NEUTRON_FLAT_NETWORK_NAME}:${NEUTRON_FLAT_NETWORK_INTERFACE}"
 
 #Initialization scripts expect a symbolic link
 /usr/bin/ln -s /etc/neutron/plugins/ml2/ml2_conf.ini /etc/neutron/plugin.ini
-- 
cgit v1.2.3