Merge lp:~andreserl/maas/packaging_bzr971 into lp:~maas-maintainers/maas/packaging

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: no longer in the source branch.
Merged at revision: 77
Proposed branch: lp:~andreserl/maas/packaging_bzr971
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 73 lines (+25/-3)
4 files modified
debian/changelog (+4/-2)
debian/maas-dhcp.config (+2/-0)
debian/maas-dhcp.postinst (+6/-1)
debian/maas-dhcp.templates (+13/-0)
To merge this branch: bzr merge lp:~andreserl/maas/packaging_bzr971
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+122737@code.launchpad.net

Commit message

Add debconf question for network interfaces

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

Reviewing and approving myself as this change is minimal and has been tested.

review: Approve
Revision history for this message
Julian Edwards (julian-edwards) wrote :

Hey Andres

Can you backport the recent changes into the packaging.precise branch too
please?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2012-09-04 16:57:27 +0000
+++ debian/changelog 2012-09-04 18:50:25 +0000
@@ -1,4 +1,4 @@
1maas (0.1+bzr957+dfsg-0ubuntu1) UNRELEASED; urgency=low1maas (0.1+bzr971+dfsg-0ubuntu1) UNRELEASED; urgency=low
22
3 * New upstream release3 * New upstream release
44
@@ -29,7 +29,9 @@
29 - debian/maas.postrm: Only call dbc_go when config file exists.29 - debian/maas.postrm: Only call dbc_go when config file exists.
30 * debian/maas.maas-celery.upstart: Enable Beat and set scheduler db file.30 * debian/maas.maas-celery.upstart: Enable Beat and set scheduler db file.
31 * debian/maas-dns.postinst: Set correct permissions. (LP: #1042868)31 * debian/maas-dns.postinst: Set correct permissions. (LP: #1042868)
32 * debian/maas-dhcp.config: Ask whether we want to enable DHCP (LP: #1044229)32 * debian/maas-dhcp.config:
33 - Ask whether we want to enable DHCP (LP: #1044229)
34 - Add debconf question for network interfaces
33 * debian/maas.prerm: Stop services before removing database (LP: #1044559)35 * debian/maas.prerm: Stop services before removing database (LP: #1044559)
3436
35 -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 02 Aug 2012 09:01:43 -040037 -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 02 Aug 2012 09:01:43 -0400
3638
=== modified file 'debian/maas-dhcp.config'
--- debian/maas-dhcp.config 2012-09-04 16:57:27 +0000
+++ debian/maas-dhcp.config 2012-09-04 18:50:25 +0000
@@ -16,6 +16,8 @@
16 db_go16 db_go
17 db_input high maas-dhcp/maas-dhcp-gateway || true17 db_input high maas-dhcp/maas-dhcp-gateway || true
18 db_go18 db_go
19 db_input high maas-dhcp/maas-dhcp-interfaces || true
20 db_go
19 fi21 fi
2022
21fi23fi
2224
=== modified file 'debian/maas-dhcp.postinst'
--- debian/maas-dhcp.postinst 2012-09-04 16:57:27 +0000
+++ debian/maas-dhcp.postinst 2012-09-04 18:50:25 +0000
@@ -24,8 +24,13 @@
24 db_get maas-dhcp/maas-dhcp-gateway || true24 db_get maas-dhcp/maas-dhcp-gateway || true
25 gateway="$RET"25 gateway="$RET"
2626
27 # Obtain the interfaces
28 db_get maas-dhcp/maas-dhcp-interfaces || true
29 interfaces="$RET"
30
27 maas config_master_dhcp --ip-range-low="$range_low" --ip-range-high="$range_high" \31 maas config_master_dhcp --ip-range-low="$range_low" --ip-range-high="$range_high" \
28 --router-ip="$gateway" --subnet-mask="$netmask" --broadcast-ip="$broadcast"32 --router-ip="$gateway" --subnet-mask="$netmask" --broadcast-ip="$broadcast" \
33 --dhcp-interfaces="$interfaces"
29 fi34 fi
3035
31fi36fi
3237
=== modified file 'debian/maas-dhcp.templates'
--- debian/maas-dhcp.templates 2012-09-04 16:57:27 +0000
+++ debian/maas-dhcp.templates 2012-09-04 18:50:25 +0000
@@ -46,3 +46,16 @@
46 the provisioned systems. The DHCP server requires you to set the46 the provisioned systems. The DHCP server requires you to set the
47 broadcast IP address. If the broadcast IP address is different47 broadcast IP address. If the broadcast IP address is different
48 from the default (192.168.1.255), you must set it here.48 from the default (192.168.1.255), you must set it here.
49
50Template: maas-dhcp/maas-dhcp-interfaces
51Type: string
52Default: eth0
53_Description: Set the Broadcast IP address for the DHCP Network Range:
54 Ubuntu MAAS Server can manage DHCP for address allocation for
55 the provisioned systems. The DHCP server requires you to set one or
56 a list of space-separated network interfaces on which DHCP will serve
57 IP addresses. The default is eth0.
58 .
59 An example of how a network interfaces should be specified is:
60 .
61 eth0 eth1 eth2

Subscribers

People subscribed via source and target branches

to all changes: