diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-28 20:27:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-28 20:27:08 +0000 |
| commit | 62dbf832adfc220a0071bd928fd905d6781374dd (patch) | |
| tree | d5aeb400cc2a378fb20e6b3dc82a40785ef3762f | |
| parent | 986edf4a97d9c98cd784067275c426f03df52f77 (diff) | |
| parent | 40be5646fa374260a4c7cac9d8d0b069ed453c65 (diff) | |
| download | kolla-62dbf832adfc220a0071bd928fd905d6781374dd.tar.gz kolla-62dbf832adfc220a0071bd928fd905d6781374dd.zip | |
Merge "Partially Implements: Container set compute-operation-neutron"
| -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 |