launchpad-reviewers team mailing list archive

[Julian Edwards <julian.edwards@xxxxxxxxxxxxx>]

Julian Edwards has proposed merging lp:~julian-edwards/maas/packaging.precise into lp:~maas-maintainers/maas/packaging.precise.

Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~julian-edwards/maas/packaging.precise/+merge/124328

The config_master_dhcp option ``--dhcp-interfaces`` is no longer valid, it needs to be --interface instead.
-- 
https://code.launchpad.net/~julian-edwards/maas/packaging.precise/+merge/124328
Your team MAAS Maintainers is requested to review the proposed merge of lp:~julian-edwards/maas/packaging.precise into lp:~maas-maintainers/maas/packaging.precise.

=== modified file 'debian/maas-dhcp.config'
--- debian/maas-dhcp.config	2012-09-04 18:42:49 +0000
+++ debian/maas-dhcp.config	2012-09-14 01:16:19 +0000
@@ -16,7 +16,7 @@
 		db_go
 		db_input high maas-dhcp/maas-dhcp-gateway || true
 		db_go
-		db_input high maas-dhcp/maas-dhcp-interfaces || true
+		db_input high maas-dhcp/maas-dhcp-interface || true
 		db_go
 	fi
 

=== modified file 'debian/maas-dhcp.postinst'
--- debian/maas-dhcp.postinst	2012-09-04 18:42:49 +0000
+++ debian/maas-dhcp.postinst	2012-09-14 01:16:19 +0000
@@ -25,12 +25,12 @@
 		gateway="$RET"
 
 		# Obtain the interfaces
-		db_get maas-dhcp/maas-dhcp-interfaces || true
-		interfaces="$RET"
+		db_get maas-dhcp/maas-dhcp-interface || true
+		interface="$RET"
 
 		maas config_master_dhcp --ip-range-low="$range_low" --ip-range-high="$range_high" \
 				--router-ip="$gateway" --subnet-mask="$netmask" --broadcast-ip="$broadcast" \
-				--dhcp-interfaces="$interfaces"
+				--interface="$interface"
 	fi
 
 fi

=== modified file 'debian/maas-dhcp.templates'
--- debian/maas-dhcp.templates	2012-09-04 18:42:49 +0000
+++ debian/maas-dhcp.templates	2012-09-14 01:16:19 +0000
@@ -47,15 +47,10 @@
  broadcast IP address. If the broadcast IP address is different
  from the default (192.168.1.255), you must set it here.
 
-Template: maas-dhcp/maas-dhcp-interfaces
+Template: maas-dhcp/maas-dhcp-interface
 Type: string
 Default: eth0
-_Description: Set the Broadcast IP address for the DHCP Network Range:
+_Description: Set the network interface that DHCP should listen on.
  Ubuntu MAAS Server can manage DHCP for address allocation for
- the provisioned systems. The DHCP server requires you to set one or
- a list of space-separated network interfaces on which DHCP will serve
- IP addresses. The default is eth0.
- .
- An example of how a network interfaces should be specified is:
- .
- eth0 eth1 eth2
+ the provisioned systems. The DHCP server requires you to set a network
+ interface on which DHCP will serve IP addresses. The default is eth0.

=== modified file 'debian/rules'
--- debian/rules	2012-08-29 03:14:49 +0000
+++ debian/rules	2012-09-14 01:16:19 +0000
@@ -46,7 +46,7 @@
               | sed -rne 's,^Version: ([^-]+).*,\1,p')
 get-orig-source:
 	bzr export -r $(REV) --root=maas-$(VER).orig \
-             maas_$(VER).orig.tar.gz lp:maas
+             maas_$(VER).orig.tar.gz /home/ed/canonical/maas/trunk
 	rm -rf maas-$(VER)
 	tar -xf maas_$(VER).orig.tar.gz
 	rm maas_$(VER).orig.tar.gz