From 7ce37b1dc29a8e09908768045bb9e800f931a63c Mon Sep 17 00:00:00 2001
From: Wenzhi Yu <wenzhi_yu@163.com>
Date: Mon, 12 Sep 2016 11:22:19 +0800
Subject: [PATCH] Clean up etcd generated file

Etcd set up process [1] will generate some extra
files, this commit cleans up the files.

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

Change-Id: Id09c89191575e8039988aaad09b693e844e084cb
---
 .gitignore       | 3 +++
 devstack/lib/zun | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index 329400bb2..1ae7eac65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,6 @@ releasenotes/build
 
 # generated config file
 etc/zun/zun.conf.sample
+
+# etcd config file
+devstack/etcd.override
diff --git a/devstack/lib/zun b/devstack/lib/zun
index 5a7bfd311..06b9f83e9 100644
--- a/devstack/lib/zun
+++ b/devstack/lib/zun
@@ -325,6 +325,9 @@ function install_etcd_server {
     elif is_fedora; then
         configure_etcd_systemd_service
     fi
+
+    # clean up etcd dirctory
+    sudo rm -rf $ZUN_DIR/etcd
 }
 
 function install_etcd_client {