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

[Andres Rodriguez]

Install twisted plugins based on python3 version.

[Andres Rodriguez (andreserl)]

selfie!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-12-11 15:49:59 +0000
+++ debian/changelog	2015-12-20 21:33:04 +0000
@@ -1,4 +1,4 @@
-maas (1.10.0~alpha1+bzr4550-0ubuntu1) UNRELEASED; urgency=medium
+maas (1.10.0~alpha1+bzr4569-0ubuntu1) UNRELEASED; urgency=medium
 
   * UNRELEASED
     - Remove all Upstart related services.

=== modified file 'debian/control'
--- debian/control	2015-12-15 17:02:54 +0000
+++ debian/control	2015-12-20 21:33:04 +0000
@@ -9,7 +9,8 @@
                po-debconf,
                python3-all,
                python3-django,
-               python3-setuptools
+               python3-setuptools,
+               python3-twisted
 Standards-Version: 3.9.6
 X-Python3-Version: >= 3.5
 Homepage: https://launchpad.net/maas

=== modified file 'debian/maas-cluster-controller.install'
--- debian/maas-cluster-controller.install	2015-12-09 19:48:31 +0000
+++ debian/maas-cluster-controller.install	2015-12-20 21:33:04 +0000
@@ -1,6 +1,3 @@
-# Install twisted plugins
-twisted/plugins/maasclusterd.py usr/lib/python3/dist-packages/twisted/plugins
-
 # Install templates
 debian/tmp/etc/maas/templates/dhcp
 debian/tmp/etc/maas/templates/power

=== modified file 'debian/maas-region-controller-min.install'
--- debian/maas-region-controller-min.install	2015-12-09 19:48:31 +0000
+++ debian/maas-region-controller-min.install	2015-12-20 21:33:04 +0000
@@ -20,9 +20,6 @@
 # Install winrm certificate generation script
 debian/tmp/usr/bin/maas-generate-winrm-cert
 
-# Install twisted plugins
-twisted/plugins/maasregiond.py usr/lib/python3/dist-packages/twisted/plugins
-
 # Install all other stuff
 debian/extras/maas-region-admin usr/sbin
 debian/extras/20-maas.conf etc/rsyslog.d

=== modified file 'debian/rules'
--- debian/rules	2015-12-11 15:49:59 +0000
+++ debian/rules	2015-12-20 21:33:04 +0000
@@ -64,6 +64,12 @@
 	install -m 644 $(CURDIR)/debian/maas-dhcp.apparmor \
 	    $(CURDIR)/debian/tmp/etc/apparmor.d/dhcpd.d/maas
 
+	# install python3 twisted plugins
+	set -ex; for python in $(PYTHON3); do \
+		dh_install twisted/plugins/maasregiond.py usr/lib/$$python/dist-packages/twisted/plugins -pmaas-region-controller-min; \
+		dh_install twisted/plugins/maasclusterd.py usr/lib/$$python/dist-packages/twisted/plugins -pmaas-cluster-controller; \
+	done
+
 	dh_install --list-missing
 
 override_dh_auto_clean: