openstack/dragonflow
Code Issues Proposed changes

devstack: Add DF_PUBLISHER_MULTIPROC_SOCKET option

Browse Source 
This option sets the publisher_multiproc_socket option

Change-Id: I25919d8d148820b4bb992ba6a5b707cea8c82be0
Closes-Bug: #1556771
This commit is contained in:
Omer Anson 2017-09-13 17:41:27 +03:00
parent 84647399d2
commit 8cee42c5f3
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devstack/plugin.sh
View File

@ -290,6 +290,7 @@ function configure_df_plugin {
iniset $DRAGONFLOW_CONF df_l2_app l2_responder "$DF_L2_RESPONDER"
iniset $DRAGONFLOW_CONF df enable_df_pub_sub "$DF_PUB_SUB"
iniset $DRAGONFLOW_CONF df pub_sub_use_multiproc "$DF_PUB_SUB_USE_MULTIPROC"
iniset $DRAGONFLOW_CONF df publisher_multiproc_socket "$DF_PUBLISHER_MULTIPROC_SOCKET"
if [[ ! -z ${EXTERNAL_HOST_IP} ]]; then
iniset $DRAGONFLOW_CONF df external_host_ip "$EXTERNAL_HOST_IP"
iniset $DRAGONFLOW_CONF df_snat_app external_network_bridge "$PUBLIC_BRIDGE"

1
devstack/settings
View File

@ -9,6 +9,7 @@ DRAGONFLOW_BRANCH=${DRAGONFLOW_BRANCH:-master}
DF_L3_BINARY=$NEUTRON_BIN_DIR/df-l3-agent
DF_LOCAL_CONTROLLER_BINARY=$NEUTRON_BIN_DIR/df-local-controller
DF_PUBLISHER_SERVICE_BINARY=$NEUTRON_BIN_DIR/df-publisher-service
DF_PUBLISHER_MULTIPROC_SOCKET=${DF_PUBLISHER_MULTIPROC_SOCKET:-"/var/run/zmq_pubsub/zmq-publisher-socket"}
# df-metadata
DF_METADATA_SERVICE=${DF_METADATA_SERVICE:-"$NEUTRON_BIN_DIR/df-metadata-service"}

3
devstack/zmq_pubsub_driver
View File

@ -1,6 +1,6 @@
#!/bin/bash
ZMQ_IPC_SOCKET=${ZMQ_IPC_SOCKET:-"/var/run/zmq_pubsub/zmq-publisher-socket"}
ZMQ_IPC_SOCKET=$DF_PUBLISHER_MULTIPROC_SOCKET
function configure_pubsub_service_plugin {
NEUTRON_CONF=${NEUTRON_CONF:-"/etc/neutron/neutron.conf"}
@ -8,7 +8,6 @@ function configure_pubsub_service_plugin {
PUB_SUB_MULTIPROC_DRIVER=${PUB_SUB_MULTIPROC_DRIVER:-"zmq_pubsub_multiproc_driver"}
iniset $DRAGONFLOW_CONF df pub_sub_driver $PUB_SUB_DRIVER
iniset $DRAGONFLOW_CONF df pub_sub_multiproc_driver $PUB_SUB_MULTIPROC_DRIVER
iniset $DRAGONFLOW_CONF df publisher_multiproc_socket $ZMQ_IPC_SOCKET
ZMQ_IPC_SOCKET_DIR=`dirname $ZMQ_IPC_SOCKET`
sudo mkdir -p $ZMQ_IPC_SOCKET_DIR