From 2852fd598a1050338eb26c43ee292591b9d4cec1 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 25 May 2017 16:31:53 -0700 Subject: [PATCH] Revert "Use devstack's zookeeper support" This reverts commit e5f5840c272d75eea38367bf5eb3f8d9f42e57e5. Devstack has removed zk support from itself in favor of etcd3. We must manage our own zk destiny. Change-Id: Ie68d7da0c0e075826fdba77ba59e05bddb932d7b --- devstack/files/debs/nodepool | 1 + devstack/settings | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/devstack/files/debs/nodepool b/devstack/files/debs/nodepool index ccba43056..fe8b87512 100644 --- a/devstack/files/debs/nodepool +++ b/devstack/files/debs/nodepool @@ -2,3 +2,4 @@ qemu-utils kpartx debootstrap yum-utils +zookeeperd diff --git a/devstack/settings b/devstack/settings index 20c0f7dba..2ceac4c82 100644 --- a/devstack/settings +++ b/devstack/settings @@ -22,7 +22,6 @@ DISKIMAGE_BUILDER_REPO_REF=${DISKIMAGE_BUILDER_REPO_REF:-master} GLEAN_REPO_URL=${GLEAN_REPO_URL:-https://git.openstack.org/openstack/glean} GLEAN_REPO_REF=${GLEAN_REPO_REF:-master} -enable_service zookeeper enable_service geard enable_service statsd enable_service nodepool-launcher