Merge "Fix receving double messages in df-controller"
This commit is contained in:
commit
017560be2a
@ -24,9 +24,6 @@ REMOTE_DB_HOSTS=${REMOTE_DB_HOSTS:-"$REMOTE_DB_IP:$REMOTE_DB_PORT"}
|
|||||||
TUNNEL_TYPE=${TUNNEL_TYPE:-$DEFAULT_TUNNEL_TYPE}
|
TUNNEL_TYPE=${TUNNEL_TYPE:-$DEFAULT_TUNNEL_TYPE}
|
||||||
DF_APPS_LIST=${DF_APPS_LIST:-$DEFAULT_APPS_LIST}
|
DF_APPS_LIST=${DF_APPS_LIST:-$DEFAULT_APPS_LIST}
|
||||||
|
|
||||||
# pub/sub
|
|
||||||
PUBLISHERS_HOSTS=${PUBLISHERS_HOSTS:-"$SERVICE_HOST"}
|
|
||||||
|
|
||||||
# OVS bridge definition
|
# OVS bridge definition
|
||||||
PUBLIC_BRIDGE=${PUBLIC_BRIDGE:-br-ex}
|
PUBLIC_BRIDGE=${PUBLIC_BRIDGE:-br-ex}
|
||||||
INTEGRATION_BRIDGE=${INTEGRATION_BRIDGE:-br-int}
|
INTEGRATION_BRIDGE=${INTEGRATION_BRIDGE:-br-int}
|
||||||
@ -140,7 +137,6 @@ function configure_df_plugin {
|
|||||||
iniset $NEUTRON_CONF df_l2_app l2_responder "$DF_L2_RESPONDER"
|
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 enable_df_pub_sub "$DF_PUB_SUB"
|
||||||
iniset $NEUTRON_CONF df pub_sub_use_multiproc "$DF_PUB_SUB_USE_MULTIPROC"
|
iniset $NEUTRON_CONF df pub_sub_use_multiproc "$DF_PUB_SUB_USE_MULTIPROC"
|
||||||
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_timeout "$PUBLISHER_RATE_LIMIT_TIMEOUT"
|
||||||
iniset $NEUTRON_CONF df publisher_rate_limit_count "$PUBLISHER_RATE_LIMIT_COUNT"
|
iniset $NEUTRON_CONF df publisher_rate_limit_count "$PUBLISHER_RATE_LIMIT_COUNT"
|
||||||
iniset $NEUTRON_CONF df_dnat_app external_network_bridge "$PUBLIC_BRIDGE"
|
iniset $NEUTRON_CONF df_dnat_app external_network_bridge "$PUBLIC_BRIDGE"
|
||||||
@ -196,7 +192,6 @@ function configure_df_plugin {
|
|||||||
iniset $NEUTRON_CONF df apps_list "$DF_APPS_LIST"
|
iniset $NEUTRON_CONF df apps_list "$DF_APPS_LIST"
|
||||||
iniset $NEUTRON_CONF df_l2_app l2_responder "$DF_L2_RESPONDER"
|
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 enable_df_pub_sub "$DF_PUB_SUB"
|
||||||
iniset $NEUTRON_CONF df publishers_ips "$PUBLISHERS_HOSTS"
|
|
||||||
iniset $NEUTRON_CONF df_dnat_app external_network_bridge "$PUBLIC_BRIDGE"
|
iniset $NEUTRON_CONF df_dnat_app external_network_bridge "$PUBLIC_BRIDGE"
|
||||||
iniset $NEUTRON_CONF df_dnat_app int_peer_patch_port "$INTEGRATION_PEER_PORT"
|
iniset $NEUTRON_CONF df_dnat_app int_peer_patch_port "$INTEGRATION_PEER_PORT"
|
||||||
iniset $NEUTRON_CONF df_dnat_app ex_peer_patch_port "$PUBLIC_PEER_PORT"
|
iniset $NEUTRON_CONF df_dnat_app ex_peer_patch_port "$PUBLIC_PEER_PORT"
|
||||||
|
Loading…
Reference in New Issue
Block a user