1c147e4def
- Updated the required variables to be sorted so that they are better visible one on each line - Removed variable defaults from each service scripts and added them to tools/genenv file which holds all default values Change-Id: Ia7b1b08ba3f963b46b81434ce84f476d56890a93 Closes-Bug: #1476494 Closes-Bug: #1467652
43 lines
1.0 KiB
Bash
Executable File
43 lines
1.0 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
set -e
|
|
|
|
. /opt/kolla/config-neutron.sh
|
|
|
|
check_required_vars NEUTRON_FLAT_NETWORK_INTERFACE \
|
|
NEUTRON_FLAT_NETWORK_NAME \
|
|
PUBLIC_IP
|
|
|
|
if ! ovs-vsctl show |grep ${NEUTRON_FLAT_NETWORK_INTERFACE} > /dev/null; then
|
|
ovs-vsctl add-br ${NEUTRON_FLAT_NETWORK_INTERFACE}
|
|
fi
|
|
|
|
cfg=/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
|
|
|
|
# Configure ml2_conf.ini
|
|
if [[ ${TYPE_DRIVERS} =~ vxlan ]]; then
|
|
crudini --set $cfg \
|
|
vxlan \
|
|
local_ip \
|
|
"${PUBLIC_IP}"
|
|
fi
|
|
|
|
crudini --set $cfg \
|
|
ovs \
|
|
bridge_mappings \
|
|
"${NEUTRON_FLAT_NETWORK_NAME}:${NEUTRON_FLAT_NETWORK_INTERFACE}"
|
|
|
|
crudini --set $cfg \
|
|
ovs \
|
|
tenant_network_type \
|
|
"${TENANT_NETWORK_TYPES}"
|
|
|
|
if [[ ${TENANT_NETWORK_TYPES} =~ "vlan" ]];then
|
|
crudini --set $cfg \
|
|
ovs \
|
|
network_vlan_ranges \
|
|
"${NEUTRON_VLAN_NETWORK_NAME}:${NEUTRON_NETWORK_VLAN_RANGES}"
|
|
fi
|
|
|
|
exec /usr/bin/neutron-openvswitch-agent --config-file /etc/neutron/neutron.conf --config-file $cfg
|