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

[Mike Pontillo]

Packaging changes necessary to monitor beacons.

This corresponds to the changes here:

https://code.launchpad.net/~mpontillo/maas/beaconing-monitor/+merge/325199

In order to use the beaconing monitor inside the .deb, these packaging changes are needed.

Even if we're not maintaining the .deb moving forward in favor of the snap, I think it's still valuable to land this for comparison purposes, while we ramp up testing of the snap. I'm still using the .debs in some local environments where I'm not ready to move to the snap yet.

[Данило Шеган (danilo)]

Pretty simple, looks good.

review: Approve

[Andres Rodriguez (andreserl)]

No debian/changelog entry saying you are adding/installing this file.

review: Needs Fixing

[lp:~mpontillo/maas/beacon-monitor--packaging]

561. By Mike Pontillo on 2017-06-21

Add sudoers entry for maas-beacon-monitor.

562. By Mike Pontillo on 2017-06-21

Update changelog.

563. By Mike Pontillo on 2017-06-21

Merge packaging trunk. Fix changelog conflict.

[Mike Pontillo (mpontillo)]

Thanks; this is ready for another look.

[lp:~mpontillo/maas/beacon-monitor--packaging]

564. By Mike Pontillo on 2017-06-27

Merge latest packaging branch.

565. By Mike Pontillo on 2017-06-27

Update changelog version.

566. By Mike Pontillo on 2017-06-27

Fix changelog merge conflict.

567. By Mike Pontillo on 2017-06-27

Separate changelog entries.

[Andres Rodriguez (andreserl)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2017-06-23 11:21:01 +0000
+++ debian/changelog	2017-06-27 16:57:32 +0000
@@ -1,14 +1,18 @@
 maas (2.3.0~alpha1-0ubuntu1) UNRELEASED; urgency=medium
 
-  * UNRELEASED
-
- -- Andres Rodriguez <[e-mail]>  Thu, 15 Jun 2017 09:03:52 +0100
-
-maas (2.2.1+bzr6054-0ubuntu1) artful; urgency=medium
-
-  * debian/rules: Fix FTBFS in artful
-
- -- Andres Rodriguez <[e-mail]>  Thu, 08 Jun 2017 19:24:15 -0400
+  * Add "maas-rack observe-beacons" to list of commands capable of
+    running as the "maas" user.
+  * Add /usr/lib/maas/maas-beacon-monitor script.
+  * Add maas-beacon-monitor script to sudoers file.
+    (Allows observation of UDP traffic sent to port 5240.)
+
+ -- Mike Pontillo <[e-mail]>  Wed, 21 Jun 2017 08:36:26 -0700
+
+maas (2.2.0+bzr6054-0ubuntu2) artful; urgency=medium
+
+  * debian/rules: Fix FTBFS in artful.
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 08 Jun 2017 18:57:01 -0400
 
 maas (2.2.0+bzr6054-0ubuntu1) artful; urgency=medium
 

=== modified file 'debian/extras/99-maas-sudoers'
--- debian/extras/99-maas-sudoers	2017-03-23 21:31:18 +0000
+++ debian/extras/99-maas-sudoers	2017-06-27 16:57:32 +0000
@@ -12,4 +12,5 @@
 maas ALL= NOPASSWD: /bin/systemctl stop maas-rackd
 maas ALL= NOPASSWD: /usr/sbin/maas-rack scan-network *
 maas ALL= NOPASSWD: /usr/lib/maas/maas-network-monitor
+maas ALL= NOPASSWD: /usr/lib/maas/maas-beacon-monitor
 maas ALL= NOPASSWD: SETENV: /usr/sbin/tgt-admin, /usr/bin/uec2roottar

=== modified file 'debian/extras/maas-rack'
--- debian/extras/maas-rack	2016-09-01 14:56:04 +0000
+++ debian/extras/maas-rack	2017-06-27 16:57:32 +0000
@@ -67,6 +67,8 @@
             users.append("dhcpd")
         if sys.argv[1] == "observe-arp":
             users.append("maas")
+        if sys.argv[1] == "observe-beacons":
+            users.append("maas")
         if sys.argv[1] == "observe-mdns":
             # Any user can call this. (It might be necessary for a normal
             # user to call this for support/debugging purposes.)

=== modified file 'debian/maas-rack-controller.install'
--- debian/maas-rack-controller.install	2017-04-26 22:43:26 +0000
+++ debian/maas-rack-controller.install	2017-06-27 16:57:32 +0000
@@ -6,6 +6,7 @@
 
 # Install network monitoring scripts
 debian/tmp/usr/lib/maas/maas-network-monitor
+debian/tmp/usr/lib/maas/maas-beacon-monitor
 debian/tmp/usr/lib/maas/maas-dhcp-monitor
 
 # Install test scripts

=== modified file 'debian/maas-rack-controller.lintian-overrides'
--- debian/maas-rack-controller.lintian-overrides	2017-04-26 22:43:26 +0000
+++ debian/maas-rack-controller.lintian-overrides	2017-06-27 16:57:32 +0000
@@ -1,1 +1,1 @@
-maas-rack-controller: binary-without-manpage usr/bin/uec2roottar usr/sbin/maas-dhcp-helper usr/lib/maas/maas-network-monitor usr/lib/maas/maas-dhcp-monitor usr/lib/maas/maas-test-enlistment
+maas-rack-controller: binary-without-manpage usr/bin/uec2roottar usr/sbin/maas-dhcp-helper usr/lib/maas/maas-network-monitor usr/lib/maas/maas-beacon-monitor usr/lib/maas/maas-dhcp-monitor usr/lib/maas/maas-test-enlistment