From: Thomas Goirand <thomas@goirand.fr>
Date: Fri, 2 Aug 2013 13:47:01 +0000 (+0200)
Subject: Correctly cleans /etc/neutron
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3e57ec3910f202a0785797b824542b7365e0fc97;p=openstack-build%2Fneutron-build.git

Correctly cleans /etc/neutron

Rewritten-From: eee24a861c1a2240b9a58f92375991ea087e427e
---

diff --git a/xenial/debian/neutron-common.postrm b/xenial/debian/neutron-common.postrm
index 0ab96f591..16ac79a9d 100644
--- a/xenial/debian/neutron-common.postrm
+++ b/xenial/debian/neutron-common.postrm
@@ -3,6 +3,7 @@
 set -e
 
 if [ "${1}" = "purge" ] ; then
+	# Purge db on purge
 	if [ -f /usr/share/debconf/confmodule ] ; then
 		. /usr/share/debconf/confmodule
 		db_get neutron/configure_db
@@ -20,9 +21,12 @@ if [ "${1}" = "purge" ] ; then
 		fi
 	fi
 
-	rm -rf /etc/default/neutron
-	rm -rf /etc/neutron/api-paste.ini /etc/neutron/neutron.conf
-	[ -d /etc/neutron ] && rmdir --ignore-fail-on-non-empty /etc/neutron
+	# Clean /etc/neutron on purge
+	rm -f /etc/default/neutron /etc/neutron/api-paste.ini /etc/neutron/neutron.conf \
+			/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
+	[ -d /etc/neutron/plugins/openvswitch ] && rmdir --ignore-fail-on-non-empty /etc/neutron/plugins/openvswitch
+	[ -d /etc/neutron/plugins ] 		&& rmdir --ignore-fail-on-non-empty /etc/neutron/plugins
+	[ -d /etc/neutron ] 			&& rmdir --ignore-fail-on-non-empty /etc/neutron
         rm -rf /var/lib/neutron
         rm -rf /var/log/neutron
 fi