MAAS

Merge lp:~mpontillo/maas/maas-network-monitor--packaging into lp:~maas-maintainers/maas/packaging

  1. maas-network-monitor--packaging
  2. Merge into packaging
Proposed by Mike Pontillo
Status: Merged
Approved by: Andres Rodriguez
Approved revision: no longer in the source branch.
Merged at revision: 511
Proposed branch: lp:~mpontillo/maas/maas-network-monitor--packaging
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 49 lines (+8/-2)
4 files modified
debian/extras/99-maas-sudoers (+1/-0)
debian/extras/maas-rack (+3/-1)
debian/maas-rack-controller.install (+3/-0)
debian/maas-rack-controller.lintian-overrides (+1/-1)
To merge this branch: bzr merge lp:~mpontillo/maas/maas-network-monitor--packaging
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+300398@code.launchpad.net

Commit message

Add installation for /usr/lib/maas/maas-network-monitor.

Description of the change

We need to install /usr/lib/maas/maas-network-monitor, and add it to the sudoers file.

This branch requires the following branch to land first:

https://code.launchpad.net/~mpontillo/maas/maas-network-monitor/+merge/300225

(Update 2016-07-18: This branch has now landed.)

We also need to create a branch for packaging-2.0 before landing this change, since both trunk and MAAS 2.0 are still using the 'packaging' branch.

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

Lgtm! Please do NOT land yet until I cut a packaging branch for 2.0.

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/extras/99-maas-sudoers'
2--- debian/extras/99-maas-sudoers 2016-06-10 18:57:41 +0000
3+++ debian/extras/99-maas-sudoers 2016-07-26 02:10:30 +0000
4@@ -11,4 +11,5 @@
5 maas ALL= NOPASSWD: /bin/systemctl disable maas-rackd
6 maas ALL= NOPASSWD: /bin/systemctl stop maas-rackd
7 maas ALL= NOPASSWD: /usr/sbin/maas-rack
8+maas ALL= NOPASSWD: /usr/lib/maas/maas-network-monitor
9 maas ALL= NOPASSWD: SETENV: /usr/sbin/tgt-admin, /usr/bin/uec2roottar
10
11=== modified file 'debian/extras/maas-rack'
12--- debian/extras/maas-rack 2016-03-17 17:14:49 +0000
13+++ debian/extras/maas-rack 2016-07-26 02:10:30 +0000
14@@ -57,11 +57,13 @@
15 "removed in a future version. From now on please use 'maas-rack' "
16 "instead.\n")
17
18- # Allow dhcpd user to call dhcp-notify.
19+ # Allow dhcpd user to call dhcp-notify, and maas user to call observe-arp.
20 users = ["root"]
21 if len(sys.argv) > 1:
22 if sys.argv[1] == "dhcp-notify":
23 users.append("dhcpd")
24+ if sys.argv[1] == "observe-arp":
25+ users.append("maas")
26
27 # Only set the group and umask when running as root.
28 if check_users(users) == "root":
29
30=== modified file 'debian/maas-rack-controller.install'
31--- debian/maas-rack-controller.install 2016-03-25 14:09:59 +0000
32+++ debian/maas-rack-controller.install 2016-07-26 02:10:30 +0000
33@@ -8,6 +8,9 @@
34 # Install maas-dhcp-helper
35 debian/tmp/usr/sbin/maas-dhcp-helper
36
37+# Install maas-network-monitor
38+debian/tmp/usr/lib/maas/maas-network-monitor
39+
40 # Install all other stuff
41 debian/extras/99-maas-sudoers etc/sudoers.d
42 debian/extras/maas-probe-dhcp usr/sbin
43
44=== modified file 'debian/maas-rack-controller.lintian-overrides'
45--- debian/maas-rack-controller.lintian-overrides 2016-03-22 17:07:45 +0000
46+++ debian/maas-rack-controller.lintian-overrides 2016-07-26 02:10:30 +0000
47@@ -1,1 +1,1 @@
48-maas-rack-controller: binary-without-manpage usr/bin/uec2roottar usr/sbin/maas-dhcp-helper
49+maas-rack-controller: binary-without-manpage usr/bin/uec2roottar usr/sbin/maas-dhcp-helper usr/lib/maas/maas-network-monitor

Subscribers

People subscribed via source and target branches