From 1ae715f885bb6835153dece0ba8a9737137f0a9a Mon Sep 17 00:00:00 2001
From: Hongbin Lu <hongbin.lu@huawei.com>
Date: Wed, 24 May 2017 18:48:16 +0000
Subject: [PATCH] Switch to devstack for installing etcd

ETCD is now a base service [1], which means it will be installed by
default in devstack. We don't need to re-install it in our devstack
plugin.

[1] https://review.openstack.org/#/c/445432/

Change-Id: Id8be0adb7b5d9c736b8acc680e9e72f82a225dec
---
 devstack/plugin.sh | 20 --------------------
 devstack/settings  |  5 ++---
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 2d5bf9dc..5d9c3773 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -16,20 +16,6 @@ XTRACE=$(set +o | grep xtrace)
 set +o xtrace
 
 echo_summary "kuryr-libnetwork's plugin.sh was called..."
-ETCD_VERSION=v2.2.2
-
-function install_etcd_data_store {
-
-    if [ ! -f "$DEST/etcd/etcd-$ETCD_VERSION-linux-amd64/etcd" ]; then
-        echo "Installing etcd server"
-        mkdir $DEST/etcd
-        wget https://github.com/coreos/etcd/releases/download/$ETCD_VERSION/etcd-$ETCD_VERSION-linux-amd64.tar.gz -O $DEST/etcd/etcd-$ETCD_VERSION-linux-amd64.tar.gz
-        tar xzvf $DEST/etcd/etcd-$ETCD_VERSION-linux-amd64.tar.gz -C $DEST/etcd
-    fi
-
-    # Clean previous DB data
-    rm -rf $DEST/etcd/db.etcd
-}
 
 
 function check_docker {
@@ -104,7 +90,6 @@ if is_service_enabled kuryr-libnetwork; then
             sudo mkdir -p ${KURYR_LOG_DIR}
             echo "Done"
         fi
-        install_etcd_data_store
         setup_develop $KURYR_HOME
 
     elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
@@ -126,9 +111,6 @@ if is_service_enabled kuryr-libnetwork; then
 
         create_kuryr_account
         configure_kuryr "${DISTRO_DISTUTILS_DATA_PATH}"
-
-        # Run etcd first
-        pgrep -x "etcd" >/dev/null || run_process etcd-server "$DEST/etcd/etcd-$ETCD_VERSION-linux-amd64/etcd --data-dir $DEST/etcd/db.etcd --advertise-client-urls http://0.0.0.0:$KURYR_ETCD_PORT  --listen-client-urls http://0.0.0.0:$KURYR_ETCD_PORT"
     fi
 
     if [[ "$1" == "stack" && "$2" == "extra" ]]; then
@@ -174,8 +156,6 @@ if is_service_enabled kuryr-libnetwork; then
         else
             stop_process kuryr-libnetwork
         fi
-        stop_process etcd-server
-        rm -rf $DEST/etcd/
     fi
 fi
 
diff --git a/devstack/settings b/devstack/settings
index f778d326..41d17eb1 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -19,11 +19,10 @@ KURYR_POOL_PREFIX=${KURYR_POOL_PREFIX:-10.10.0.0/16}
 KURYR_POOL_PREFIX_LEN=${KURYR_POOL_PREFIX_LEN:-24}
 
 KURYR_DOCKER_ENGINE_PORT=${KURYR_DOCKER_ENGINE_PORT:-2375}
-KURYR_ETCD_PORT=${KURYR_ETCD_PORT:-4001}
-DOCKER_CLUSTER_STORE=${DOCKER_CLUSTER_STORE:-etcd://localhost:$KURYR_ETCD_PORT}
+DOCKER_CLUSTER_STORE=${DOCKER_CLUSTER_STORE:-etcd://localhost:2379}
 
 GITREPO["kuryr"]=${KURYR_REPO:-${GIT_BASE}/openstack/kuryr.git}
 GITBRANCH["kuryr"]=${KURYR_BRANCH:-master}
 GITDIR["kuryr"]=$DEST/kuryr
 
-enable_service kuryr-libnetwork etcd-server docker-engine
+enable_service kuryr-libnetwork etcd3 docker-engine