Merge "Support Zookeeper multi-node deployment"

devstack/zookeeper_driver

@@ -21,7 +21,7 @@ ZOOKEEPER_CONF_FILE="${ZOOKEEPER_CONF_DIR}/zoo.cfg"
 ZOOKEEPER_TABLE_NAMES=${ZOOKEEPER_TABLE_NAMES:-'secgroup','dragonflow','chassis','lswitch','lport','lrouter','tunnel_key'}
 
 function nb_db_driver_install_server {
-    if is_service_enabled df-zookeeper ; then
+    if is_service_enabled df-zookeeper-server ; then
         if is_ubuntu; then
             echo "Installing Zookeeper server"
             sudo mkdir -p $ZOOKEEPER_DATA_DIR
@@ -47,7 +47,7 @@ function nb_db_driver_install_client {
 
 function nb_db_driver_status_server
 {
-    if is_service_enabled df-zookeeper ; then
+    if is_service_enabled df-zookeeper-server ; then
         TEMP_PIDS=`pgrep -f "zookeeper"`
         if [ -z "$TEMP_PIDS" ]; then
             return 1
@@ -57,7 +57,7 @@ function nb_db_driver_status_server
 }
 
 function nb_db_driver_start_server {
-    if is_service_enabled df-zookeeper ; then
+    if is_service_enabled df-zookeeper-server ; then
         if is_ubuntu; then
             sudo service zookeeper restart
         fi
@@ -65,7 +65,7 @@ function nb_db_driver_start_server {
 }
 
 function nb_db_driver_stop_server {
-    if is_service_enabled df-zookeeper ; then
+    if is_service_enabled df-zookeeper-server ; then
         if is_ubuntu; then
             sudo service zookeeper stop || true
         fi

doc/source/multi-node-conf/zookeeper_compute_node.conf

@@ -0,0 +1,44 @@
+[[local|localrc]]
+
+LOGFILE=$DEST/logs/stack.sh.log
+
+#OFFLINE=True
+#RECLONE=False
+
+Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True
+
+DATABASE_PASSWORD=password
+RABBIT_PASSWORD=password
+SERVICE_PASSWORD=password
+SERVICE_TOKEN=password
+ADMIN_PASSWORD=password
+
+enable_plugin dragonflow http://git.openstack.org/openstack/dragonflow
+
+disable_all_services
+enable_service n-cpu
+enable_service df-zookeeper
+enable_service df-controller
+enable_service db-ext-services
+enable_service n-novnc
+
+# Set this to the address of the main DevStack host running the rest of the
+# OpenStack services. (Controller node)
+
+SERVICE_HOST=<IP address of host running everything else>
+RABBIT_HOST=$SERVICE_HOST
+Q_HOST=$SERVICE_HOST
+
+# Specify Zookeeper server or cluster
+# When deploying Zookeeper cluster, you can use ',' to specify multiple servers.
+REMOTE_DB_HOSTS=$SERVICE_HOST:2181
+
+# Make VNC work on compute node
+NOVA_VNC_ENABLED=True
+NOVNCPROXY_URL=http://$SERVICE_HOST:6080/vnc_auto.html
+VNCSERVER_LISTEN=$HOST_IP
+VNCSERVER_PROXYCLIENT_ADDRESS=$VNCSERVER_LISTEN
+
+[[post-config|$NEUTRON_CONF]]
+[df]
+enable_df_pub_sub = True

doc/source/multi-node-conf/zookeeper_controller_node.conf

@@ -0,0 +1,41 @@
+[[local|localrc]]
+
+LOGFILE=$DEST/logs/stack.sh.log
+
+#OFFLINE=True
+#RECLONE=False
+
+Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True
+
+DATABASE_PASSWORD=password
+RABBIT_PASSWORD=password
+SERVICE_PASSWORD=password
+SERVICE_TOKEN=password
+ADMIN_PASSWORD=password
+
+enable_plugin dragonflow http://git.openstack.org/openstack/dragonflow
+enable_service df-zookeeper
+enable_service df-zookeeper-server
+enable_service df-controller
+enable_service db-ext-services
+
+disable_service n-net
+enable_service q-svc
+enable_service q-l3
+enable_service q-meta
+enable_service q-dhcp
+enable_service cinder
+disable_service heat
+disable_service tempest
+
+# We have to disable the neutron L2 agent. DF does not use the L2 agent.
+disable_service q-agt
+
+# Specify Zookeeper server or cluster
+# When deploying Zookeeper cluster, you can use ',' to specify multiple servers.
+REMOTE_DB_HOSTS=$HOST_IP:2181
+
+# The build-in PUB/SUB mechanism is mandatory for Zookeeper backend.
+[[post-config|$NEUTRON_CONF]]
+[df]
+enable_df_pub_sub = True

doc/source/readme.rst

@@ -81,7 +81,7 @@ Etcd Database:
 
     enable_service df-etcd-server
 
-Ram Cloud Database
+Ram Cloud Database:
 
     enable_service df-ramcloud
 
@@ -89,6 +89,12 @@ Ram Cloud Database
 
     enable_service df-rcmaster
 
+Zookeeper Database:
+
+    enable_service df-zookeeper
+
+    enable_service df-zookeeper-server
+
 Detailed Installation
 ---------------------
 

doc/source/single-node-conf/zookeeper_local_controller.conf

@@ -0,0 +1,41 @@
+[[local|localrc]]
+
+LOGFILE=$DEST/logs/stack.sh.log
+
+#OFFLINE=True
+#RECLONE=False
+
+Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True
+
+DATABASE_PASSWORD=password
+RABBIT_PASSWORD=password
+SERVICE_PASSWORD=password
+SERVICE_TOKEN=password
+ADMIN_PASSWORD=password
+
+enable_plugin dragonflow http://git.openstack.org/openstack/dragonflow
+enable_service df-zookeeper
+enable_service df-zookeeper-server
+enable_service df-controller
+enable_service db-ext-services
+
+disable_service n-net
+enable_service q-svc
+enable_service q-l3
+enable_service q-meta
+enable_service q-dhcp
+enable_service cinder
+disable_service heat
+disable_service tempest
+
+# We have to disable the neutron L2 agent. DF does not use the L2 agent.
+disable_service q-agt
+
+# Specify Zookeeper server or cluster
+# When deploying Zookeeper cluster, you can use ',' to specify multiple servers.
+REMOTE_DB_HOSTS=$HOST_IP:2181
+
+# The build-in PUB/SUB mechanism is mandatory for Zookeeper backend.
+[[post-config|$NEUTRON_CONF]]
+[df]
+enable_df_pub_sub = True