openstack
/
dragonflow
Code Issues Proposed changes

Merge "Modified default pubsub mechanism to etcd"

This commit is contained in:
Zuul 2018-01-15 10:50:47 +00:00 committed by Gerrit Code Review
parent ac9b8be529 ff9a24ac30
commit d157333a47
6 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/multi-node-conf/etcd_compute_node.conf
View File

@ -40,4 +40,4 @@ VNCSERVER_PROXYCLIENT_ADDRESS=$VNCSERVER_LISTEN
[[post-config|$NEUTRON_CONF]]
[df]
enable_df_pub_sub = True
pub_sub_driver = "zmq_pubsub_driver"
pub_sub_driver = etcd_pubsub_driver

2
doc/source/multi-node-conf/etcd_controller_node.conf
View File

@ -10,7 +10,7 @@ enable_plugin dragonflow http://git.openstack.org/openstack/dragonflow
enable_service df-etcd
enable_service df-etcd-server
enable_service df-controller
enable_service df-zmq-publisher-service
enable_service df-etcd-pubsub-service
disable_service n-net
enable_service q-svc

2
doc/source/single-node-conf/etcd_local_controller.conf
View File

@ -9,7 +9,7 @@ ADMIN_PASSWORD=password
enable_plugin dragonflow https://git.openstack.org/openstack/dragonflow
enable_service df-etcd
enable_service df-controller
enable_service df-zmq-publisher-service
enable_service df-etcd-pubsub-service
disable_service n-net
enable_service q-svc

2
vagrant/provisioning/setup-aio.sh
View File

@ -4,8 +4,6 @@ cp /dragonflow/doc/source/single-node-conf/etcd_local_controller.conf ~/devstack
# Get the IP address
ipaddress=$(ifconfig eth1 2>/dev/null|awk '/inet addr:/ {split($2,a,":"); print a[2]}')
SED_SCRIPT="s/df-zmq-publisher-service/df-etcd-pubsub-service/g"
sed -i -e "$SED_SCRIPT" devstack/local.conf
# Adjust some things in local.conf

1
vagrant/provisioning/setup-compute.sh
View File

@ -7,7 +7,6 @@ ipaddress=$(ifconfig eth1 2>/dev/null|awk '/inet addr:/ {split($2,a,":"); print
SED_SCRIPT="s/^\(HOST_IP\)=.*/\1=$ipaddress/g"
SED_SCRIPT="$SED_SCRIPT;/TUNNEL_ENDPOINT_IP/d"
SED_SCRIPT="$SED_SCRIPT;s/^\(SERVICE_HOST\)=.*/\1=$1/g"
SED_SCRIPT="$SED_SCRIPT;s/zmq_pubsub_driver/etcd_pubsub_driver/g"
sed -i -e "$SED_SCRIPT" devstack/local.conf

1
vagrant/provisioning/setup-controller.sh
View File

@ -6,7 +6,6 @@ ipaddress=$(ifconfig eth1 2>/dev/null|awk '/inet addr:/ {split($2,a,":"); print
SED_SCRIPT="s/^\(HOST_IP\)=.*/\1=$ipaddress/g"
SED_SCRIPT="$SED_SCRIPT;/TUNNEL_ENDPOINT_IP/d"
SED_SCRIPT="$SED_SCRIPT;s/df-zmq-publisher-service/df-etcd-pubsub-service/g"
sed -i -e "$SED_SCRIPT" devstack/local.conf