Merge ~andreserl/maas:fix_sudoers into maas:master

[Andres Rodriguez]

LP: #1732561 - Fix active subnet mapping

[Mike Pontillo (mpontillo)]

Looks good; thanks!

review: Approve

diff --git a/debian/extras/99-maas-common-sudoers b/debian/extras/99-maas-common-sudoers
index da4a5af..8aedc86 100644
--- a/debian/extras/99-maas-common-sudoers
+++ b/debian/extras/99-maas-common-sudoers
@@ -14,3 +14,6 @@ maas ALL= NOPASSWD: /bin/systemctl status ntp
 # Writing and deleting files as root.
 maas ALL= NOPASSWD: /usr/lib/maas/maas-delete-file
 maas ALL= NOPASSWD: /usr/lib/maas/maas-write-file
+
+# Allow active subnet mapping
+maas ALL= NOPASSWD: /usr/lib/maas/maas-common scan-network *
diff --git a/debian/extras/99-maas-sudoers b/debian/extras/99-maas-sudoers
index c36b644..912c591 100644
--- a/debian/extras/99-maas-sudoers
+++ b/debian/extras/99-maas-sudoers
@@ -10,5 +10,4 @@ maas ALL= NOPASSWD: /bin/systemctl status tgt
 maas ALL= NOPASSWD: /bin/systemctl start tgt
 maas ALL= NOPASSWD: /bin/systemctl disable maas-rackd
 maas ALL= NOPASSWD: /bin/systemctl stop maas-rackd
-maas ALL= NOPASSWD: /usr/sbin/maas-rack scan-network *
 maas ALL= NOPASSWD: SETENV: /usr/sbin/tgt-admin, /usr/bin/uec2roottar