openstack
/
dragonflow
Code Issues Proposed changes

Merge "Add external bridge in devstack when dnat is enabled."

This commit is contained in:
Jenkins 2016-05-29 12:39:27 +00:00 committed by Gerrit Code Review
parent b1b6c036c0 05af611606
commit d7997ef928
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devstack/ovs_setup.sh
View File

@ -155,6 +155,13 @@ function start_ovs {
_neutron_ovs_base_setup_bridge br-int
sudo ovs-vsctl --no-wait set bridge br-int fail-mode=secure other-config:disable-in-band=true
# setup external bridge if necessary
check_dnat=$(echo $DF_APPS_LIST | grep "DNATApp")
if [[ "$check_dnat" != "" ]]; then
echo "Setup external bridge for DNAT"
sudo ovs-vsctl add-br $PUBLIC_BRIDGE || true
fi
fi
cd $_pwd

11
devstack/plugin.sh
View File

@ -21,10 +21,13 @@ NB_DRIVER_CLASS=${NB_DRIVER_CLASS:-$DEFAULT_NB_DRIVER_CLASS}
TUNNEL_TYPE=${TUNNEL_TYPE:-$DEFAULT_TUNNEL_TYPE}
DF_APPS_LIST=${DF_APPS_LIST:-$DEFAULT_APPS_LIST}
#pubsub
# pub/sub
PUBLISHERS_HOSTS=${PUBLISHERS_HOSTS:-"$SERVICE_HOST"}
#ovs related pid files
# OVS bridge definition
PUBLIC_BRIDGE=${PUBLIC_BRIDGE:-br-ex}
# OVS related pid files
OVS_DB_SERVICE="ovsdb-server"
OVS_VSWITCHD_SERVICE="ovs-vswitchd"
OVS_DIR="/var/run/openvswitch"
@ -107,7 +110,7 @@ function configure_df_plugin {
iniset $NEUTRON_CONF df publishers_ips "$PUBLISHERS_HOSTS"
iniset $NEUTRON_CONF df publisher_rate_limit_timeout "$PUBLISHER_RATE_LIMIT_TIMEOUT"
iniset $NEUTRON_CONF df publisher_rate_limit_count "$PUBLISHER_RATE_LIMIT_COUNT"
iniset $NEUTRON_CONF df_dnat_app external_network_bridge "br-ex"
iniset $NEUTRON_CONF df_dnat_app external_network_bridge "$PUBLIC_BRIDGE"
iniset $NEUTRON_CONF df_dnat_app int_peer_patch_port "patch-ex"
iniset $NEUTRON_CONF df_dnat_app ex_peer_patch_port "patch-int"
iniset $NEUTRON_CONF DEFAULT advertise_mtu "True"
@ -160,7 +163,7 @@ function configure_df_plugin {
iniset $NEUTRON_CONF df_l2_app l2_responder "$DF_L2_RESPONDER"
iniset $NEUTRON_CONF df enable_df_pub_sub "$DF_PUB_SUB"
iniset $NEUTRON_CONF df publishers_ips "$PUBLISHERS_HOSTS"
iniset $NEUTRON_CONF df_dnat_app external_network_bridge "br-ex"
iniset $NEUTRON_CONF df_dnat_app external_network_bridge "$PUBLIC_BRIDGE"
iniset $NEUTRON_CONF df_dnat_app int_peer_patch_port "patch-ex"
iniset $NEUTRON_CONF df_dnat_app ex_peer_patch_port "patch-int"