Merge lp:~andreserl/maas/packaging_1.10 into lp:~maas-maintainers/maas/packaging-1.10

[Andres Rodriguez]

* debian/rules: Correctly install init scripts.
* debian/maas-dhcp.postinst: Disable isc-dhcp-server6 too.
* debian/{maas-proxy,maas-cluster-controller}.install: No longer install
  overrides for init scripts for squid3 and isc-dhcp.
* debian/maas-region-controller.postinst: Enable maas-regiond and
  ensure we correctly restart clusterd.

[Andres Rodriguez (andreserl)]

selfie!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-02-01 17:00:09 +0000
+++ debian/changelog	2016-02-10 15:56:29 +0000
@@ -1,3 +1,25 @@
+maas (1.10.0+bzr4578-0ubuntu2) xenial; urgency=medium
+
+  * debian/rules: Correctly install init scripts.
+  * debian/maas-dhcp.postinst: Disable isc-dhcp-server6 too.
+  * debian/{maas-proxy,maas-cluster-controller}.install: No longer install
+    overrides for init scripts for squid3 and isc-dhcp.
+  * debian/maas-region-controller.postinst: Enable maas-regiond and
+    ensure we correctly restart clusterd.
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 10 Feb 2016 07:21:16 -0500
+
+maas (1.10.0+bzr4578-0ubuntu1) xenial; urgency=medium
+
+  * New trunk version of 1.10.0 bzr 4578:
+    - Fix encoding issues in enlistment (LP: #1540765)
+    - Fix issue of decoding the output of the IPMI command (LP: #1541878)
+    - Skip block devices with duplicate serial numbers to fix
+      multipath issue. (LP: #1526542)
+    - BMC fails after node is commissioned (LP: #1542287)
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 03 Feb 2016 18:28:22 +0100
+
 maas (1.10.0+bzr4572-0ubuntu2) xenial; urgency=medium
 
   * debian/maas-region-controller.config: Ensure we truly preseed db
 
=== modified file 'debian/control'
--- debian/control	2016-02-01 17:00:09 +0000
+++ debian/control	2016-02-10 15:56:29 +0000
@@ -103,6 +103,8 @@
          python3-pexpect,
          python3-pyparsing,
          python3-seamicroclient,
+         python3-pyvmomi,
+         python3-simplejson,
          python3-simplestreams,
          python3-tempita,
          python3-twisted,
@@ -172,7 +174,7 @@
          wget,
          ${misc:Depends},
          ${python3:Depends}
-Suggests: amtterm, ipmitool, libvirt-bin, python3-pyvmomi
+Suggests: amtterm, ipmitool, libvirt-bin, wsmancli
 Conflicts: tftpd-hpa
 Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ),
         maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 ),
 
=== modified file 'debian/maas-dhcp.postinst'
--- debian/maas-dhcp.postinst	2015-11-25 17:34:18 +0000
+++ debian/maas-dhcp.postinst	2016-02-10 15:56:29 +0000
@@ -8,6 +8,8 @@
     # We run our own dhcpd instances.
     systemctl stop isc-dhcp-server >/dev/null || true
     systemctl disable isc-dhcp-server >/dev/null || true
+    systemctl stop isc-dhcp-server6 >/dev/null || true
+    systemctl disable isc-dhcp-server6 >/dev/null || true
 
     dhcpd_prof="/etc/apparmor.d/usr.sbin.dhcpd"
     if [ -f "${dhcpd_prof}" ] && command -v apparmor_parser >/dev/null 2>&1
 
=== modified file 'debian/maas-proxy.install'
--- debian/maas-proxy.install	2015-08-13 09:01:57 +0000
+++ debian/maas-proxy.install	2016-02-10 15:56:29 +0000
@@ -1,3 +1,2 @@
 debian/extras/maas-proxy.conf usr/share/maas/
 debian/extras/maas-proxy-common.sh usr/share/maas/
-debian/extras/squid3.override etc/init/
 
=== modified file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst	2015-11-25 17:34:18 +0000
+++ debian/maas-region-controller.postinst	2016-02-10 15:56:29 +0000
@@ -148,10 +148,11 @@
     configure_migrate_maas_dns
 fi
 
+systemctl enable maas-regiond >/dev/null || true
 invoke-rc.d maas-regiond restart || true
 invoke-rc.d apache2 restart || true
 
-if [ -f /etc/init/maas-clusterd.conf ]; then
+if [ -f /lib/systemd/system/maas-clusterd.service ]; then
     invoke-rc.d maas-clusterd restart || true
 fi
 
 
=== modified file 'debian/rules'
--- debian/rules	2016-01-29 21:03:14 +0000
+++ debian/rules	2016-02-10 15:56:29 +0000
@@ -13,19 +13,26 @@
 	# internet access
 
 override_dh_installinit:
-	dh_installinit --name=maas-regiond --no-start
-	dh_installinit --name=maas-regiond-worker@  --no-start
-	dh_installinit --name=maas-clusterd
-	dh_installinit --name=maas-dhcpd
-	dh_installinit --name=maas-dhcpd6
-	dh_installinit --name=maas-proxy
+	dh_installinit -p maas-region-controller-min --name=maas-regiond --no-start
+	dh_installinit -p maas-region-controller-min --name=maas-regiond-worker@  --no-start
+	dh_installinit -p maas-cluster-controller --name=maas-clusterd
+	dh_installinit -p maas-proxy --name=maas-proxy
+	dh_installinit -p maas-dhcp --name=maas-dhcpd
+	dh_installinit -p maas-dhcp --name=maas-dhcpd6
+
+override_dh_systemd_enable:
+	dh_systemd_enable -p maas-region-controller-min --name=maas-regiond
+	dh_systemd_enable -p maas-cluster-controller --name=maas-clusterd
+	dh_systemd_enable -p maas-proxy --name=maas-proxy
+	dh_systemd_enable -p maas-dhcp --name=maas-dhcpd
+	dh_systemd_enable -p maas-dhcp --name=maas-dhcpd6
 
 override_dh_systemd_start:
 	dh_systemd_start -p maas-region-controller-min --no-start maas-regiond.service
 	dh_systemd_start -p maas-cluster-controller maas-clusterd.service
-	dh_systemd_start -p maas-dhcpd maas-dhcpd.service
-	dh_systemd_start -p maas-dhcpd6 maas-dhcpd6.service
 	dh_systemd_start -p maas-proxy maas-proxy.service
+	dh_systemd_start -p maas-dhcp maas-dhcpd.service
+	dh_systemd_start -p maas-dhcp maas-dhcpd6.service
 
 override_dh_auto_build:
 	dh_auto_build