MAAS

Merge lp:~julian-edwards/maas/packaging.precise into lp:~maas-maintainers/maas/packaging.precise

  1. packaging.precise
  2. Merge into packaging.precise
Proposed by Julian Edwards on 2012-09-14
Status: Merged
Approved by: Julian Edwards on 2012-09-14
Approved revision: 76
Merged at revision: 75
Proposed branch: lp:~julian-edwards/maas/packaging.precise
Merge into: lp:~maas-maintainers/maas/packaging.precise
Diff against target: 69 lines (+9/-14)
4 files modified
debian/maas-dhcp.config (+1/-1)
debian/maas-dhcp.postinst (+3/-3)
debian/maas-dhcp.templates (+4/-9)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~julian-edwards/maas/packaging.precise
Reviewer Review Type Date Requested Status
Scott Moser 2012-09-14 Approve on 2012-09-14
Review via email: mp+124328@code.launchpad.net

Commit Message

The config_master_dhcp option ``--dhcp-interfaces`` is no longer valid, it needs to be --interface instead.

Description of the Change

The config_master_dhcp option ``--dhcp-interfaces`` is no longer valid, it needs to be --interface instead.

To post a comment you must log in.
lp:~julian-edwards/maas/packaging.precise updated on 2012-09-14
76. By Julian Edwards on 2012-09-14

fix recipe builds - a local change was put in by mistake

Scott Moser (smoser) wrote :

Approve, pending the removal of debian/rules change before merging.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/maas-dhcp.config'
2--- debian/maas-dhcp.config 2012-09-04 18:42:49 +0000
3+++ debian/maas-dhcp.config 2012-09-14 01:20:23 +0000
4@@ -16,7 +16,7 @@
5 db_go
6 db_input high maas-dhcp/maas-dhcp-gateway || true
7 db_go
8- db_input high maas-dhcp/maas-dhcp-interfaces || true
9+ db_input high maas-dhcp/maas-dhcp-interface || true
10 db_go
11 fi
12
13
14=== modified file 'debian/maas-dhcp.postinst'
15--- debian/maas-dhcp.postinst 2012-09-04 18:42:49 +0000
16+++ debian/maas-dhcp.postinst 2012-09-14 01:20:23 +0000
17@@ -25,12 +25,12 @@
18 gateway="$RET"
19
20 # Obtain the interfaces
21- db_get maas-dhcp/maas-dhcp-interfaces || true
22- interfaces="$RET"
23+ db_get maas-dhcp/maas-dhcp-interface || true
24+ interface="$RET"
25
26 maas config_master_dhcp --ip-range-low="$range_low" --ip-range-high="$range_high" \
27 --router-ip="$gateway" --subnet-mask="$netmask" --broadcast-ip="$broadcast" \
28- --dhcp-interfaces="$interfaces"
29+ --interface="$interface"
30 fi
31
32 fi
33
34=== modified file 'debian/maas-dhcp.templates'
35--- debian/maas-dhcp.templates 2012-09-04 18:42:49 +0000
36+++ debian/maas-dhcp.templates 2012-09-14 01:20:23 +0000
37@@ -47,15 +47,10 @@
38 broadcast IP address. If the broadcast IP address is different
39 from the default (192.168.1.255), you must set it here.
40
41-Template: maas-dhcp/maas-dhcp-interfaces
42+Template: maas-dhcp/maas-dhcp-interface
43 Type: string
44 Default: eth0
45-_Description: Set the Broadcast IP address for the DHCP Network Range:
46+_Description: Set the network interface that DHCP should listen on.
47 Ubuntu MAAS Server can manage DHCP for address allocation for
48- the provisioned systems. The DHCP server requires you to set one or
49- a list of space-separated network interfaces on which DHCP will serve
50- IP addresses. The default is eth0.
51- .
52- An example of how a network interfaces should be specified is:
53- .
54- eth0 eth1 eth2
55+ the provisioned systems. The DHCP server requires you to set a network
56+ interface on which DHCP will serve IP addresses. The default is eth0.
57
58=== modified file 'debian/rules'
59--- debian/rules 2012-08-29 03:14:49 +0000
60+++ debian/rules 2012-09-14 01:20:23 +0000
61@@ -46,7 +46,7 @@
62 | sed -rne 's,^Version: ([^-]+).*,\1,p')
63 get-orig-source:
64 bzr export -r $(REV) --root=maas-$(VER).orig \
65- maas_$(VER).orig.tar.gz lp:maas
66+ maas_$(VER).orig.tar.gz lp:maas/12.04-nocobbler
67 rm -rf maas-$(VER)
68 tar -xf maas_$(VER).orig.tar.gz
69 rm maas_$(VER).orig.tar.gz

Subscribers

People subscribed via source and target branches

to all changes: