MAAS

Merge ~andreserl/maas:fix_sudoers into maas:master

  1. Git
  2. lp:~andreserl/maas
  3. fix_sudoers
  4. Merge into master
Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: b633c5bca48beee4e67aac8d153947417975c394
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~andreserl/maas:fix_sudoers
Merge into: maas:master
Diff against target: 21 lines (+3/-1)
2 files modified
debian/extras/99-maas-common-sudoers (+3/-0)
debian/extras/99-maas-sudoers (+0/-1)
Reviewer Review Type Date Requested Status
Mike Pontillo (community) Approve
MAAS Lander unittests Pending
Review via email: mp+333782@code.launchpad.net

Commit message

LP: #1732561 - Fix active subnet mapping

To post a comment you must log in.
Revision history for this message
Mike Pontillo (mpontillo) wrote :

Looks good; thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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
14# Writing and deleting files as root.14# Writing and deleting files as root.
15maas ALL= NOPASSWD: /usr/lib/maas/maas-delete-file15maas ALL= NOPASSWD: /usr/lib/maas/maas-delete-file
16maas ALL= NOPASSWD: /usr/lib/maas/maas-write-file16maas ALL= NOPASSWD: /usr/lib/maas/maas-write-file
17
18# Allow active subnet mapping
19maas 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
10maas ALL= NOPASSWD: /bin/systemctl start tgt10maas ALL= NOPASSWD: /bin/systemctl start tgt
11maas ALL= NOPASSWD: /bin/systemctl disable maas-rackd11maas ALL= NOPASSWD: /bin/systemctl disable maas-rackd
12maas ALL= NOPASSWD: /bin/systemctl stop maas-rackd12maas ALL= NOPASSWD: /bin/systemctl stop maas-rackd
13maas ALL= NOPASSWD: /usr/sbin/maas-rack scan-network *
14maas ALL= NOPASSWD: SETENV: /usr/sbin/tgt-admin, /usr/bin/uec2roottar13maas ALL= NOPASSWD: SETENV: /usr/sbin/tgt-admin, /usr/bin/uec2roottar

Subscribers

People subscribed via source and target branches