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

[Andres Rodriguez]

Add debconf question for network interfaces

[Andres Rodriguez (andreserl)]

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

review: Approve

[Julian Edwards (julian-edwards)]

Hey Andres

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

=== 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 @@
-maas (0.1+bzr957+dfsg-0ubuntu1) UNRELEASED; urgency=low
+maas (0.1+bzr971+dfsg-0ubuntu1) UNRELEASED; urgency=low
 
   * New upstream release
 
@@ -29,7 +29,9 @@
     - debian/maas.postrm: Only call dbc_go when config file exists.
   * debian/maas.maas-celery.upstart: Enable Beat and set scheduler db file.
   * debian/maas-dns.postinst: Set correct permissions. (LP: #1042868)
-  * debian/maas-dhcp.config: Ask whether we want to enable DHCP (LP: #1044229)
+  * debian/maas-dhcp.config:
+    - Ask whether we want to enable DHCP (LP: #1044229)
+    - Add debconf question for network interfaces
   * debian/maas.prerm: Stop services before removing database (LP: #1044559)
 
  -- Andres Rodriguez <[e-mail]>  Thu, 02 Aug 2012 09:01:43 -0400

=== 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 @@
 		db_go
 		db_input high maas-dhcp/maas-dhcp-gateway || true
 		db_go
+		db_input high maas-dhcp/maas-dhcp-interfaces || true
+		db_go
 	fi
 
 fi

=== 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 @@
 		db_get maas-dhcp/maas-dhcp-gateway || true
 		gateway="$RET"
 
+		# Obtain the interfaces
+		db_get maas-dhcp/maas-dhcp-interfaces || true
+		interfaces="$RET"
+
 		maas config_master_dhcp --ip-range-low="$range_low" --ip-range-high="$range_high" \
-				--router-ip="$gateway" --subnet-mask="$netmask" --broadcast-ip="$broadcast"
+				--router-ip="$gateway" --subnet-mask="$netmask" --broadcast-ip="$broadcast" \
+				--dhcp-interfaces="$interfaces"
 	fi
 
 fi

=== 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 @@
  the provisioned systems. The DHCP server requires you to set the
  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
+Type: string
+Default: eth0
+_Description: Set the Broadcast IP address for the DHCP Network Range:
+ 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