diff options
| author | Daneyon Hansen <danehans@cisco.com> | 2015-03-27 23:36:06 +0000 |
|---|---|---|
| committer | Daneyon Hansen <danehans@cisco.com> | 2015-03-27 23:36:06 +0000 |
| commit | 40be5646fa374260a4c7cac9d8d0b069ed453c65 (patch) | |
| tree | a2a9fb3d0e69adfc9d5b3c4cd35e51d187257451 | |
| parent | afcc1569b8fe3f962ad13bd0ed780c3336163fd3 (diff) | |
| download | kolla-40be5646fa374260a4c7cac9d8d0b069ed453c65.tar.gz kolla-40be5646fa374260a4c7cac9d8d0b069ed453c65.zip | |
Partially Implements: Container set compute-operation-neutron
Adds the neutron-linuxbridge-agent to the neutron container set.
Change-Id: I20752611c24a3110cc5d2e4fca2d501fc32a4d87
| -rw-r--r-- | compose/linux-bridge.yml | 7 | ||||
| -rwxr-xr-x | docker/neutron/agents/linux-bridge/start.sh | 10 | ||||
| -rwxr-xr-x | tools/genenv | 4 |
3 files changed, 14 insertions, 7 deletions
diff --git a/compose/linux-bridge.yml b/compose/linux-bridge.yml new file mode 100644 index 000000000..75f27f8df --- /dev/null +++ b/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 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,8 +5,8 @@ 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 @@ -14,17 +14,13 @@ 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 \ "${PUBLIC_IP}" 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 diff --git a/tools/genenv b/tools/genenv index 01bdbe61a..5484cb8f7 100755 --- a/tools/genenv +++ b/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 |