From ff9a24ac30fb414c3bb1bc59c2c9f71f63252fdf Mon Sep 17 00:00:00 2001 From: Shachar Snapiri Date: Sun, 14 Jan 2018 15:37:52 +0200 Subject: [PATCH] Modified default pubsub mechanism to etcd In setups where we have etcd installed, we now use etcd pubsub instead of the zmq pubsub. This is more natural and prevents issues during the install process. Change-Id: I23fa9b1282eea53c3a05af6324644c1c815a491d --- doc/source/multi-node-conf/etcd_compute_node.conf | 2 +- doc/source/multi-node-conf/etcd_controller_node.conf | 2 +- doc/source/single-node-conf/etcd_local_controller.conf | 2 +- vagrant/provisioning/setup-aio.sh | 2 -- vagrant/provisioning/setup-compute.sh | 1 - vagrant/provisioning/setup-controller.sh | 1 - 6 files changed, 3 insertions(+), 7 deletions(-) diff --git a/doc/source/multi-node-conf/etcd_compute_node.conf b/doc/source/multi-node-conf/etcd_compute_node.conf index 8b6ccac7f..32c8d881d 100644 --- a/doc/source/multi-node-conf/etcd_compute_node.conf +++ b/doc/source/multi-node-conf/etcd_compute_node.conf @@ -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 diff --git a/doc/source/multi-node-conf/etcd_controller_node.conf b/doc/source/multi-node-conf/etcd_controller_node.conf index e55d2d15c..1c252c5b7 100644 --- a/doc/source/multi-node-conf/etcd_controller_node.conf +++ b/doc/source/multi-node-conf/etcd_controller_node.conf @@ -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 diff --git a/doc/source/single-node-conf/etcd_local_controller.conf b/doc/source/single-node-conf/etcd_local_controller.conf index d1f3e49f6..6310106fe 100644 --- a/doc/source/single-node-conf/etcd_local_controller.conf +++ b/doc/source/single-node-conf/etcd_local_controller.conf @@ -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 diff --git a/vagrant/provisioning/setup-aio.sh b/vagrant/provisioning/setup-aio.sh index a3b111679..950a98443 100644 --- a/vagrant/provisioning/setup-aio.sh +++ b/vagrant/provisioning/setup-aio.sh @@ -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 diff --git a/vagrant/provisioning/setup-compute.sh b/vagrant/provisioning/setup-compute.sh index c7986e3da..86465fcb4 100644 --- a/vagrant/provisioning/setup-compute.sh +++ b/vagrant/provisioning/setup-compute.sh @@ -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 diff --git a/vagrant/provisioning/setup-controller.sh b/vagrant/provisioning/setup-controller.sh index 27fd7311b..02aebb952 100644 --- a/vagrant/provisioning/setup-controller.sh +++ b/vagrant/provisioning/setup-controller.sh @@ -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