Support enable_tunneling openvswitch configuration variable
Adds support for setting the new openvswitch configuration variable added in https://review.openstack.org/#/c/12686/. Change-Id: Ic599de0fbdc922160580189b94c666a597abe182
This commit is contained in:
parent
c132625d1d
commit
fddd8f8f05
14
stack.sh
14
stack.sh
@ -1196,6 +1196,12 @@ if is_service_enabled quantum; then
|
|||||||
# Example: LB_PHYSICAL_INTERFACE=eth1
|
# Example: LB_PHYSICAL_INTERFACE=eth1
|
||||||
LB_PHYSICAL_INTERFACE=${LB_PHYSICAL_INTERFACE:-}
|
LB_PHYSICAL_INTERFACE=${LB_PHYSICAL_INTERFACE:-}
|
||||||
|
|
||||||
|
# With the openvswitch plugin, set to True in localrc to enable
|
||||||
|
# provider GRE tunnels when ENABLE_TENANT_TUNNELS is False.
|
||||||
|
#
|
||||||
|
# Example: OVS_ENABLE_TUNNELING=True
|
||||||
|
OVS_ENABLE_TUNNELING=${OVS_ENABLE_TUNNELING:-$ENABLE_TENANT_TUNNELS}
|
||||||
|
|
||||||
# Put config files in ``/etc/quantum`` for everyone to find
|
# Put config files in ``/etc/quantum`` for everyone to find
|
||||||
if [[ ! -d /etc/quantum ]]; then
|
if [[ ! -d /etc/quantum ]]; then
|
||||||
sudo mkdir -p /etc/quantum
|
sudo mkdir -p /etc/quantum
|
||||||
@ -1272,6 +1278,11 @@ if is_service_enabled q-svc; then
|
|||||||
if [[ "$OVS_VLAN_RANGES" != "" ]]; then
|
if [[ "$OVS_VLAN_RANGES" != "" ]]; then
|
||||||
iniset /$Q_PLUGIN_CONF_FILE OVS network_vlan_ranges $OVS_VLAN_RANGES
|
iniset /$Q_PLUGIN_CONF_FILE OVS network_vlan_ranges $OVS_VLAN_RANGES
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Enable tunnel networks if selected
|
||||||
|
if [[ $OVS_ENABLE_TUNNELING = "True" ]]; then
|
||||||
|
iniset /$Q_PLUGIN_CONF_FILE OVS enable_tunneling True
|
||||||
|
fi
|
||||||
elif [[ "$Q_PLUGIN" = "linuxbridge" ]]; then
|
elif [[ "$Q_PLUGIN" = "linuxbridge" ]]; then
|
||||||
if [[ "$ENABLE_TENANT_VLANS" = "True" ]]; then
|
if [[ "$ENABLE_TENANT_VLANS" = "True" ]]; then
|
||||||
iniset /$Q_PLUGIN_CONF_FILE VLANS tenant_network_type vlan
|
iniset /$Q_PLUGIN_CONF_FILE VLANS tenant_network_type vlan
|
||||||
@ -1302,7 +1313,7 @@ if is_service_enabled q-agt; then
|
|||||||
quantum_setup_ovs_bridge $OVS_BRIDGE
|
quantum_setup_ovs_bridge $OVS_BRIDGE
|
||||||
|
|
||||||
# Setup agent for tunneling
|
# Setup agent for tunneling
|
||||||
if [[ "$ENABLE_TENANT_TUNNELS" = "True" ]]; then
|
if [[ "$OVS_ENABLE_TUNNELING" = "True" ]]; then
|
||||||
# Verify tunnels are supported
|
# Verify tunnels are supported
|
||||||
# REVISIT - also check kernel module support for GRE and patch ports
|
# REVISIT - also check kernel module support for GRE and patch ports
|
||||||
OVS_VERSION=`ovs-vsctl --version | head -n 1 | awk '{print $4;}'`
|
OVS_VERSION=`ovs-vsctl --version | head -n 1 | awk '{print $4;}'`
|
||||||
@ -1311,6 +1322,7 @@ if is_service_enabled q-agt; then
|
|||||||
echo "OVS 1.4+ is required for tunneling between multiple hosts."
|
echo "OVS 1.4+ is required for tunneling between multiple hosts."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
iniset /$Q_PLUGIN_CONF_FILE OVS enable_tunneling True
|
||||||
iniset /$Q_PLUGIN_CONF_FILE OVS local_ip $HOST_IP
|
iniset /$Q_PLUGIN_CONF_FILE OVS local_ip $HOST_IP
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user