From 486561671abf37ac8ac902d87c27838bc2b97388 Mon Sep 17 00:00:00 2001
From: Hari <haripk@juniper.net>
Date: Thu, 24 Sep 2015 17:06:27 +0530
Subject: [PATCH] Do not remove /var/log/contrail directory on package
 uninstall.

Remove the log files and remove the directory only when it is empty.

Change-Id: I7921f5695f875a31bd5ed20efdbaec6bae4bd67a
partial-bug: 1499191
---
 .../contrail/debian/contrail-analytics.postrm | 24 +++++++++++++++-
 debian/contrail/debian/contrail-config.postrm | 28 ++++++++++++++++++-
 .../contrail/debian/contrail-control.postrm   | 15 +++++++++-
 debian/contrail/debian/contrail-dns.postrm    | 13 ++++++++-
 .../debian/contrail-vrouter-agent.postrm      | 17 ++++++++++-
 5 files changed, 92 insertions(+), 5 deletions(-)

diff --git a/debian/contrail/debian/contrail-analytics.postrm b/debian/contrail/debian/contrail-analytics.postrm
index 1481a1be..4ab9fcba 100644
--- a/debian/contrail/debian/contrail-analytics.postrm
+++ b/debian/contrail/debian/contrail-analytics.postrm
@@ -15,8 +15,30 @@ if [ "${1}" = "purge" ] ; then
     delgroup --system --quiet contrail || true
   fi
 
-  rm -rf /var/log/contrail /var/lib/contrail
+  rm -f /var/log/contrail/contrail-analytics-api.log*
+  rm -f /var/log/contrail/contrail-analytics-api-stdout.log*
+  rm -f /var/log/contrail/contrail-analytics-nodemgr-stderr.log*
+  rm -f /var/log/contrail/contrail-analytics-nodemgr-stdout.log*
+  rm -f /var/log/contrail/contrail-collector.log*
+  rm -f /var/log/contrail/contrail-collector-stdout.log*
+  rm -f /var/log/contrail/contrail-query-engine.log*
+  rm -f /var/log/contrail/contrail-query-engine-stdout.log*
+  rm -f /var/log/contrail/contrail-alarm-gen.log*
+  rm -f /var/log/contrail/contrail-alarm-gen-stdout.log*
+  rm -f /var/log/contrail/contrail-snmp-collector.log*
+  rm -f /var/log/contrail/contrail-snmp-collector-stdout.log*
+  rm -f /var/log/contrail/contrail-topology.log*
+  rm -f /var/log/contrail/contrail-topology-stdout.log*
+  rm -f /var/log/contrail/process_statecontrail-analytics.json
+  rm -f /var/log/contrail/supervisord-analytics.log*
 
+  if [ ! "$(ls -A /var/log/contrail)" ]; then
+    rm -rf /var/log/contrail
+  fi
+
+  if [ ! "$(ls -A /var/lib/contrail)" ]; then
+    rm -rf /var/lib/contrail
+  fi
 fi
 
 #DEBHELPER#
diff --git a/debian/contrail/debian/contrail-config.postrm b/debian/contrail/debian/contrail-config.postrm
index 1481a1be..036703f7 100644
--- a/debian/contrail/debian/contrail-config.postrm
+++ b/debian/contrail/debian/contrail-config.postrm
@@ -15,7 +15,33 @@ if [ "${1}" = "purge" ] ; then
     delgroup --system --quiet contrail || true
   fi
 
-  rm -rf /var/log/contrail /var/lib/contrail
+  rm -f /var/log/contrail/api-*-zk.log*
+  rm -f /var/log/contrail/contrail-api.log*
+  rm -f /var/log/contrail/contrail-api-*-stdout.log*
+  rm -f /var/log/contrail/contrail-device-manager.log*
+  rm -f /var/log/contrail/contrail-device-manager-stdout.log*
+  rm -f /var/log/contrail/device-manager-zk.log*
+  rm -f /var/log/contrail/contrail-schema.log*
+  rm -f /var/log/contrail/contrail-schema-stdout.log*
+  rm -f /var/log/contrail/schema-zk.log*
+  rm -f /var/log/contrail/contrail-svc-monitor.log*
+  rm -f /var/log/contrail/contrail-svc-monitor-stdout.log*
+  rm -f /var/log/contrail/svc-monitor.err*
+  rm -f /var/log/contrail/svc-monitor-zk.log*
+  rm -f /var/log/contrail/discovery.log*
+  rm -f /var/log/contrail/contrail-discovery-*-stdout.log*
+  rm -f /var/log/contrail/contrail-config-nodemgr-stdout.log*
+  rm -f /var/log/contrail/contrail-config-nodemgr-stderr.log*
+  rm -f /var/log/contrail/process_statecontrail-config.json
+  rm -f /var/log/contrail/supervisord-config.log*
+
+  if [ ! "$(ls -A /var/log/contrail)" ]; then
+    rm -rf /var/log/contrail
+  fi
+
+  if [ ! "$(ls -A /var/lib/contrail)" ]; then
+    rm -rf /var/lib/contrail
+  fi
 
 fi
 
diff --git a/debian/contrail/debian/contrail-control.postrm b/debian/contrail/debian/contrail-control.postrm
index 1481a1be..d41e822a 100644
--- a/debian/contrail/debian/contrail-control.postrm
+++ b/debian/contrail/debian/contrail-control.postrm
@@ -15,7 +15,20 @@ if [ "${1}" = "purge" ] ; then
     delgroup --system --quiet contrail || true
   fi
 
-  rm -rf /var/log/contrail /var/lib/contrail
+  rm -f /var/log/contrail/contrail-control.log*
+  rm -f /var/log/contrail/contrail-control-stdout.log*
+  rm -f /var/log/contrail/contrail-control-nodemgr-stderr.log*
+  rm -f /var/log/contrail/contrail-control-nodemgr-stdout.log*
+  rm -f /var/log/contrail/process_statecontrail-control.json
+  rm -f /var/log/contrail/supervisord-control.log*
+
+  if [ ! "$(ls -A /var/log/contrail)" ]; then
+    rm -rf /var/log/contrail
+  fi
+
+  if [ ! "$(ls -A /var/lib/contrail)" ]; then
+    rm -rf /var/lib/contrail
+  fi
 
 fi
 
diff --git a/debian/contrail/debian/contrail-dns.postrm b/debian/contrail/debian/contrail-dns.postrm
index 1481a1be..e84ba269 100644
--- a/debian/contrail/debian/contrail-dns.postrm
+++ b/debian/contrail/debian/contrail-dns.postrm
@@ -15,7 +15,18 @@ if [ "${1}" = "purge" ] ; then
     delgroup --system --quiet contrail || true
   fi
 
-  rm -rf /var/log/contrail /var/lib/contrail
+  rm -f /var/log/contrail/contrail-dns.log*
+  rm -f /var/log/contrail/contrail-dns-stdout.log*
+  rm -f /var/log/contrail/contrail-named.log*
+  rm -f /var/log/contrail/contrail-named-stdout.log*
+
+  if [ ! "$(ls -A /var/log/contrail)" ]; then
+    rm -rf /var/log/contrail
+  fi
+
+  if [ ! "$(ls -A /var/lib/contrail)" ]; then
+    rm -rf /var/lib/contrail
+  fi
 
 fi
 
diff --git a/debian/contrail/debian/contrail-vrouter-agent.postrm b/debian/contrail/debian/contrail-vrouter-agent.postrm
index 1481a1be..0af8a4d8 100644
--- a/debian/contrail/debian/contrail-vrouter-agent.postrm
+++ b/debian/contrail/debian/contrail-vrouter-agent.postrm
@@ -15,8 +15,23 @@ if [ "${1}" = "purge" ] ; then
     delgroup --system --quiet contrail || true
   fi
 
-  rm -rf /var/log/contrail /var/lib/contrail
+  # Remove log files
+  rm -f /var/log/contrail/contrail-vrouter-agent.log*
+  rm -f /var/log/contrail/contrail-vrouter-agent-stdout.log*
+  rm -f /var/log/contrail/contrail-tor-agent*
+  rm -f /var/log/contrail/contrail-vrouter-nodemgr-stderr.log*
+  rm -f /var/log/contrail/contrail-vrouter-nodemgr-stdout.log*
+  rm -f /var/log/contrail/supervisord-vrouter.log*
+  rm -f /var/log/contrail/process_statecontrail-vrouter.json
 
+  if [ ! "$(ls -A /var/log/contrail)" ]; then
+    rm -rf /var/log/contrail
+  fi
+
+  rm -rf /var/lib/contrail/ports /var/lib/contrail/dhcp
+  if [ ! "$(ls -A /var/lib/contrail)" ]; then
+    rm -rf /var/lib/contrail
+  fi
 fi
 
 #DEBHELPER#