Merge ~alemar99/maas:lp-2060277-merge into maas:3.5

[Alessandro Marcolini]

 fix: bug lp#2060277
https://bugs.launchpad.net/maas/+bug/2060277

(cherry-picked from e7cbf290608a8c7b25268424f43b706bd8de4ae8)

[Alessandro Marcolini (alemar99)]

Self-approving backport

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp-2060277-merge lp:~alemar99/maas/+git/maas into -b 3.5 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/5259/console
COMMIT: 41037f2088b34e6dd2088476cbf0b77417b233a4

review: Needs Fixing

diff --git a/debian/maas-common.postrm b/debian/maas-common.postrm
index 2fcac5e..292bc62 100755
--- a/debian/maas-common.postrm
+++ b/debian/maas-common.postrm
@@ -24,6 +24,8 @@ case "$1" in
         rm -rf /var/lib/maas/certificates
         rm -rf /var/lib/maas/http
         rm -f /run/lock/maas:*
+        # clean-up /etc/maas/certificates
+        rm -rf /etc/maas/certificates
 esac
 
 rm -f /etc/rsyslog.d/99-maas.conf
diff --git a/debian/maas-rack-controller.postrm b/debian/maas-rack-controller.postrm
index ffabaa5..fff196b 100755
--- a/debian/maas-rack-controller.postrm
+++ b/debian/maas-rack-controller.postrm
@@ -35,6 +35,9 @@ case "$1" in
         # Remove rackd.conf file
         rm -rf /etc/maas/rackd.conf
 
+        # Remove agent.yaml file
+        rm -rf /etc/maas/agent.yaml
+
         # Deleting old config files if they exist
         if [ -f /etc/maas/pserv.yaml.maas-old ]; then
             rm -rf /etc/maas/pserv.yaml.maas-old