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

Proposed by Mike Pontillo
Status: Merged
Approved by: Mike Pontillo
Approved revision: 567
Merged at revision: 562
Proposed branch: lp:~mpontillo/maas/beacon-monitor--packaging
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 73 lines (+18/-10)
5 files modified
debian/changelog (+13/-9)
debian/extras/99-maas-sudoers (+1/-0)
debian/extras/maas-rack (+2/-0)
debian/maas-rack-controller.install (+1/-0)
debian/maas-rack-controller.lintian-overrides (+1/-1)
To merge this branch: bzr merge lp:~mpontillo/maas/beacon-monitor--packaging
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Данило Шеган (community) Approve
Review via email: mp+325493@code.launchpad.net

Commit message

Packaging changes necessary to monitor beacons.

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Данило Шеган (danilo) wrote :

Pretty simple, looks good.

review: Approve
Revision history for this message
Andres Rodriguez (andreserl) wrote :

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

review: Needs Fixing
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.

Revision history for this message
Mike Pontillo (mpontillo) wrote :

Thanks; this is ready for another look.

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.

Revision history for this message
Andres Rodriguez (andreserl) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1maas (2.3.0~alpha1-0ubuntu1) UNRELEASED; urgency=medium1maas (2.3.0~alpha1-0ubuntu1) UNRELEASED; urgency=medium
22
3 * UNRELEASED3 * Add "maas-rack observe-beacons" to list of commands capable of
44 running as the "maas" user.
5 -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 15 Jun 2017 09:03:52 +01005 * Add /usr/lib/maas/maas-beacon-monitor script.
66 * Add maas-beacon-monitor script to sudoers file.
7maas (2.2.1+bzr6054-0ubuntu1) artful; urgency=medium7 (Allows observation of UDP traffic sent to port 5240.)
88
9 * debian/rules: Fix FTBFS in artful9 -- Mike Pontillo <mike.pontillo@canonical.com> Wed, 21 Jun 2017 08:36:26 -0700
1010
11 -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 08 Jun 2017 19:24:15 -040011maas (2.2.0+bzr6054-0ubuntu2) artful; urgency=medium
12
13 * debian/rules: Fix FTBFS in artful.
14
15 -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 08 Jun 2017 18:57:01 -0400
1216
13maas (2.2.0+bzr6054-0ubuntu1) artful; urgency=medium17maas (2.2.0+bzr6054-0ubuntu1) artful; urgency=medium
1418
1519
=== 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 @@
12maas ALL= NOPASSWD: /bin/systemctl stop maas-rackd12maas ALL= NOPASSWD: /bin/systemctl stop maas-rackd
13maas ALL= NOPASSWD: /usr/sbin/maas-rack scan-network *13maas ALL= NOPASSWD: /usr/sbin/maas-rack scan-network *
14maas ALL= NOPASSWD: /usr/lib/maas/maas-network-monitor14maas ALL= NOPASSWD: /usr/lib/maas/maas-network-monitor
15maas ALL= NOPASSWD: /usr/lib/maas/maas-beacon-monitor
15maas ALL= NOPASSWD: SETENV: /usr/sbin/tgt-admin, /usr/bin/uec2roottar16maas ALL= NOPASSWD: SETENV: /usr/sbin/tgt-admin, /usr/bin/uec2roottar
1617
=== 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 @@
67 users.append("dhcpd")67 users.append("dhcpd")
68 if sys.argv[1] == "observe-arp":68 if sys.argv[1] == "observe-arp":
69 users.append("maas")69 users.append("maas")
70 if sys.argv[1] == "observe-beacons":
71 users.append("maas")
70 if sys.argv[1] == "observe-mdns":72 if sys.argv[1] == "observe-mdns":
71 # Any user can call this. (It might be necessary for a normal73 # Any user can call this. (It might be necessary for a normal
72 # user to call this for support/debugging purposes.)74 # user to call this for support/debugging purposes.)
7375
=== 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 @@
66
7# Install network monitoring scripts7# Install network monitoring scripts
8debian/tmp/usr/lib/maas/maas-network-monitor8debian/tmp/usr/lib/maas/maas-network-monitor
9debian/tmp/usr/lib/maas/maas-beacon-monitor
9debian/tmp/usr/lib/maas/maas-dhcp-monitor10debian/tmp/usr/lib/maas/maas-dhcp-monitor
1011
11# Install test scripts12# Install test scripts
1213
=== 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 @@
1maas-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-enlistment1maas-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

Subscribers

People subscribed via source and target branches