Merge "Partially Implements: Container set compute-operation-neutron"

compose/linux-bridge.yml

@@ -0,0 +1,7 @@
+linuxbridge:
+  image: kollaglue/centos-rdo-linux-bridge
+  name: neutron-linuxbridge-agent
+  net: "host"
+  restart: always
+  env_file:
+   - openstack.env

docker/neutron/agents/linux-bridge/start.sh

@@ -5,18 +5,14 @@ set -e
 . /opt/kolla/config-neutron.sh
 . /sudoers.sh
 
-: ${BRIDGE_PHYSICAL_INTERFACE:=eth1}
+: ${NEUTRON_FLAT_NETWORK_NAME:=physnet1}
-: ${ML2_FLAT_NETWORK:=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

tools/genenv

@@ -67,6 +67,10 @@ CONFIG_NETWORK=True
 ENABLED_APIS=ec2,osapi_compute,metadata
 METADATA_HOST=$HOST_IP
 
+# Neutron Linux Bridge Agent
+NEUTRON_FLAT_NETWORK_NAME=physnet1
+NEUTRON_FLAT_NETWORK_INTERFACE=eth1
+
 # Heat
 HEAT_DB_NAME=heat
 HEAT_DB_PASSWORD=kolla