From 14a1f5832af26d024326e790eb151a8ddf1336dd Mon Sep 17 00:00:00 2001 From: Ignatious Johnson Christopher Date: Mon, 24 Aug 2015 15:14:52 -0700 Subject: [PATCH] Fixing the fab uninstall_contrail task not to remove debs_list.txt, rpm_list.txt file from /etc/contrail in case of partial uninstall Closes-Bug:1484788 Change-Id: Ib4edb8f1a9aac6dcae9f9c91ca1715de38164712 (cherry picked from commit d4c08c028deb370b15cf08eaf03bb50637adaee3) --- fabfile/tasks/uninstall.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/fabfile/tasks/uninstall.py b/fabfile/tasks/uninstall.py index f18d78b0d..05743fe5f 100644 --- a/fabfile/tasks/uninstall.py +++ b/fabfile/tasks/uninstall.py @@ -328,7 +328,13 @@ def uninstall_only_vrouter_node(manage_nova_compute='yes', *args): with cd('/etc/'): sudo('sudo rm -rf libvirt') with settings(warn_only=True): - sudo('find ./contrail/* ! -iname \'contrail_ifrename.sh\' -delete') + cmds = ['find ./contrail/*' + '! -iname "contrail_ifrename.sh"', + '! -iname "debs_list.txt"', + '! -iname "rpm_list.txt"', + '-delete', + ] + sudo(' '.join(cmds)) with cd('/var/'): sudo('sudo rm -rf crashes') sudo('sudo rm -rf tmp')