Merge lp:~mpontillo/maas/observe-dhcp--packaging into lp:~maas-maintainers/maas/packaging

Proposed by Mike Pontillo on 2016-10-05
Status: Merged
Approved by: Mike Pontillo on 2016-10-05
Approved revision: 530
Merged at revision: 530
Proposed branch: lp:~mpontillo/maas/observe-dhcp--packaging
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 35 lines (+3/-10)
3 files modified
debian/extras/maas-probe-dhcp (+0/-7)
debian/maas-rack-controller.install (+2/-2)
debian/maas-rack-controller.lintian-overrides (+1/-1)
To merge this branch: bzr merge lp:~mpontillo/maas/observe-dhcp--packaging
Reviewer Review Type Date Requested Status
Gavin Panella (community) 2016-10-05 Approve on 2016-10-05
Review via email: mp+307652@code.launchpad.net

Commit message

Packaging changes for external DHCP detection.

 * Add maas-dhcp-monitor to packaging. This is needed in order
   for the `maas-rack observe-dhcp` support/debug command
   to work. (It is not yet used by MAAS proper, which is why the
   sudoers file was NOT modified in this branch.)
 * Remove obsolete maas-probe-dhcp script; it no longer works.

Description of the change

Note: this branch must not land until the following branch lands:

https://code.launchpad.net/~mpontillo/maas/observe-dhcp-setup-py/+merge/307651

To post a comment you must log in.
Gavin Panella (allenap) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'debian/extras/maas-probe-dhcp'
2--- debian/extras/maas-probe-dhcp 2015-12-09 02:18:13 +0000
3+++ debian/extras/maas-probe-dhcp 1970-01-01 00:00:00 +0000
4@@ -1,7 +0,0 @@
5-#!/bin/sh
6-if [ "$(id -u)" != "0" ]; then
7- echo "This utility may only be run as root." 1>&2
8- exit 1
9-fi
10-export PYTHONPATH="/usr/share/maas${PYTHONPATH:+:}${PYTHONPATH}"
11-exec /usr/bin/python3 -m provisioningserver.dhcp.probe "$@"
12
13=== modified file 'debian/maas-rack-controller.install'
14--- debian/maas-rack-controller.install 2016-09-01 14:56:04 +0000
15+++ debian/maas-rack-controller.install 2016-10-05 05:58:06 +0000
16@@ -4,10 +4,10 @@
17 # Install maas-dhcp-helper
18 debian/tmp/usr/sbin/maas-dhcp-helper
19
20-# Install maas-network-monitor
21+# Install network monitoring scripts
22 debian/tmp/usr/lib/maas/maas-network-monitor
23+debian/tmp/usr/lib/maas/maas-dhcp-monitor
24
25 # Install all other stuff
26 debian/extras/99-maas-sudoers etc/sudoers.d
27-debian/extras/maas-probe-dhcp usr/sbin
28 debian/extras/maas-rack usr/sbin
29
30=== modified file 'debian/maas-rack-controller.lintian-overrides'
31--- debian/maas-rack-controller.lintian-overrides 2016-07-18 23:28:26 +0000
32+++ debian/maas-rack-controller.lintian-overrides 2016-10-05 05:58:06 +0000
33@@ -1,1 +1,1 @@
34-maas-rack-controller: binary-without-manpage usr/bin/uec2roottar usr/sbin/maas-dhcp-helper usr/lib/maas/maas-network-monitor
35+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

Subscribers

People subscribed via source and target branches