From 292e55394ebf4abf2dd6fd76f546329a0d16f552 Mon Sep 17 00:00:00 2001
From: Davanum Srinivas <davanum@gmail.com>
Date: Thu, 4 May 2017 13:40:54 -0400
Subject: [PATCH] Cleanup etcd, docker, kubernetes

Change-Id: I307a67f9e28edc1410893d9930e9372e1fa8fed0
---
 devstack/plugin.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 34ee2dd..6c41dab 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -139,6 +139,15 @@ function install_k8s_cloud_provider {
 # runs that a clean run would need to clean up
 function cleanup_k8s_cloud_provider {
     echo_summary "Cleaning up Devstack Plugin for k8s-cloud-provider"
+    # Kill etcd and the k8s processes
+    ps -ef | grep -e etcd -e hyperkube | grep -v grep | awk '{print $2}' | xargs sudo kill -9
+
+    # Cleanup docker images and containers
+    sudo docker rm -f $(docker ps -a -q) || true
+    sudo docker rmi -f $(docker images -q -a) || true
+
+    # Stop docker
+    sudo systemctl stop docker.service
     sudo rm -rf "$K8S_SRC"
     sudo rm -rf "$DEST/etcd"
 }