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

[Andres Rodriguez]

Correctly install init scripts.
Introduce maas-rack-controller package.
Handle upgrades from previous releases.

[lp:~andreserl/maas/packaging_rack_controller]

446. By Andres Rodriguez on 2016-02-16

Handle upgrades from earlier releases

[Andres Rodriguez (andreserl)]

selfie!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-02-04 11:31:17 +0000
+++ debian/changelog	2016-02-16 15:44:23 +0000
@@ -1,7 +1,8 @@
-maas (2.0.0~alpha1+bzr4636-0ubuntu1) UNRELEASED; urgency=medium
+maas (2.0.0~alpha1+bzr4657-0ubuntu1) UNRELEASED; urgency=medium
 
   * New usptream release:
   * Rename maas-cluster* to maas-rack* and handle the upgrade path.
+  * Fix installation of init scripts and daemon systemd units.
 
  -- Andres Rodriguez <[e-mail]>  Mon, 01 Feb 2016 18:18:52 +0100
 

=== modified file 'debian/control'
--- debian/control	2016-02-04 11:31:17 +0000
+++ debian/control	2016-02-16 15:44:23 +0000
@@ -104,7 +104,9 @@
          python3-paramiko,
          python3-pexpect,
          python3-pyparsing,
+         python3-pyvmomi,
          python3-seamicroclient,
+         python3-simplejson,
          python3-simplestreams,
          python3-tempita,
          python3-twisted,
@@ -170,7 +172,7 @@
          wget,
          ${misc:Depends},
          ${python3:Depends}
-Suggests: amtterm, ipmitool, libvirt-bin, python3-pyvmomi
+Suggests: amtterm, ipmitool, libvirt-bin, wsmancli
 Conflicts: tftpd-hpa
 Breaks: python-maas-provisioningserver,
         maas-cluster-controller
@@ -224,7 +226,7 @@
 
 Package: maas-proxy
 Architecture: all
-Depends: squid3, ${misc:Depends}, ${python3:Depends}
+Depends: squid3, ${misc:Depends}
 Conflicts: squid-deb-proxy
 Replaces: squid-deb-proxy
 Description: MAAS Caching Proxy

=== modified file 'debian/maas-dhcp.postinst'
--- debian/maas-dhcp.postinst	2015-11-25 17:34:18 +0000
+++ debian/maas-dhcp.postinst	2016-02-16 15:44:23 +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-16 15:44:23 +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-rack-controller.install'
--- debian/maas-rack-controller.install	2016-02-04 10:08:48 +0000
+++ debian/maas-rack-controller.install	2016-02-16 15:44:23 +0000
@@ -9,6 +9,5 @@
 
 # Install all other stuff
 debian/extras/99-maas-sudoers etc/sudoers.d
-debian/extras/isc-dhcp-server.override etc/init
 debian/extras/maas-probe-dhcp usr/sbin
 debian/extras/maas-provision usr/sbin

=== modified file 'debian/maas-rack-controller.maintscript'
--- debian/maas-rack-controller.maintscript	2016-02-04 11:31:17 +0000
+++ debian/maas-rack-controller.maintscript	2016-02-16 15:44:23 +0000
@@ -14,5 +14,5 @@
 rm_conffile /etc/maas/templates/power/vmware.template 1.9.0~alpha1+bzr4184-0ubuntu1
 rm_conffile /etc/maas/templates/power/ipmi.conf 1.9.0~alpha1+bzr4221-0ubuntu1
 rm_conffile /etc/maas/templates/power/ipmi.template 1.9.0~alpha1+bzr4221-0ubuntu1
-rm_conffile /etc/init/maas-cluster.conf 2.0.0~alpha1+bzr4635-0ubuntu1
+rm_conffile /etc/init/maas-clusterd.conf 2.0.0~alpha1+bzr4635-0ubuntu1
 rm_conffile /lib/systemd/system/maas-clusterd.service 2.0.0~alpha1+bzr4635-0ubuntu1

=== modified file 'debian/maas-rack-controller.postinst'
--- debian/maas-rack-controller.postinst	2016-02-04 10:08:48 +0000
+++ debian/maas-rack-controller.postinst	2016-02-16 15:44:23 +0000
@@ -79,6 +79,29 @@
     fi
 }
 
+upgrade_from_cluster_controller() {
+    # If we are upgrading from an older (1.7, 1.8) version, then we need
+    # to obtain the cluster UUID from the old configuration file and set
+    # it with the new configuration tool.
+    if [ -f /etc/maas/maas_cluster.conf ]; then
+        uuid=$(extract_cluster_uuid /etc/maas/maas_cluster.conf)
+        maas-provision config --uuid "$uuid"
+        maas_url=$(extract_maas_url /etc/maas/maas_cluster.conf)
+        maas-provision config --region-url "$maas_url"
+        db_set maas-rack-controller/maas-url "$maas_url"
+        mv /etc/maas/maas_cluster.conf /etc/maas/maas_cluster.conf.maas-old
+        mv /etc/maas/pserv.yaml /etc/maas/pserv.yaml.maas-old
+    fi
+    # If we are upgrading from (1.9, 1.10) version, then we need to obtain
+    # the maas_url and set it to debconf. Otherwise, the config file used
+    # is exactly the same.
+    if [ -f /etc/maas/clusterd.conf.1.10 ]; then
+        mv /etc/maas/clusterd.conf.1.10 /etc/maas/rackd.conf
+        maas_url=$(extract_maas_url /etc/maas/rackd.conf)
+        db_set maas-rack-controller/maas-url "$maas_url"
+    fi
+}
+
 # Unconditionally ensure that there is at least an empty configuration
 # file. This does *not* overwrite any existing configuration.
 maas-provision config
@@ -91,6 +114,7 @@
     configure_cluster_uuid
     configure_cluster_authbind
     maas-provision upgrade-cluster
+    upgrade_from_cluster_controller
 
 elif [ -n "$DEBCONF_RECONFIGURE" ]; then
     configure_maas_url
@@ -103,19 +127,6 @@
     configure_shared_secret
 
 elif [ "$1" = "configure" ] && dpkg --compare-versions "$2" gt 0.1+bzr266+dfsg-0ubuntu1; then
-    # If we are upgrading from an older version, then we need to obtain
-    # the cluster UUID from the old configuration file and set it with
-    # the new configuration tool.
-    if [ -f /etc/maas/maas_cluster.conf ]; then
-        uuid=$(extract_cluster_uuid /etc/maas/maas_cluster.conf)
-        maas-provision config --uuid "$uuid"
-        maas_url=$(extract_maas_url /etc/maas/maas_cluster.conf)
-        maas-provision config --region-url "$maas_url"
-        db_set maas-rack-controller/maas-url "$maas_url"
-        mv /etc/maas/maas_cluster.conf /etc/maas/maas_cluster.conf.maas-old
-        mv /etc/maas/pserv.yaml /etc/maas/pserv.yaml.maas-old
-    fi
-
     configure_cluster_authbind
     maas-provision upgrade-cluster
 fi

=== modified file 'debian/maas-rack-controller.preinst'
--- debian/maas-rack-controller.preinst	2016-02-04 11:31:17 +0000
+++ debian/maas-rack-controller.preinst	2016-02-16 15:44:23 +0000
@@ -4,53 +4,41 @@
 
 . /usr/share/debconf/confmodule
 
-if [ "$1" = "upgrade" ]; then
-
-    if dpkg --compare-versions "$2" lt 1.7.0~beta3+bzr3066-0ubuntu1; then
-        if [ -f /etc/init/maas-pserv.conf ]; then
-            invoke-rc.d maas-pserv stop
-        fi
-
-        if [ -f /etc/init/maas-cluster-celery.conf ]; then
-            invoke-rc.d maas-cluster-celery stop
-        fi
-
-        if [ -f /var/log/maas/celery.log ]; then
-            rm -rf /var/log/maas/celery.log
-        fi
-    fi
-
-    if dpkg --compare-versions "$2" lt 1.7.0~beta6+bzr3232-0ubuntu1; then
-        if [ -f /etc/init/maas-cluster.conf ]; then
-            invoke-rc.d maas-cluster stop
-        fi
-    fi
-
-    if dpkg --compare-versions "$2" lt 1.8.0~alpha1+bzr3486-0ubuntu1; then
-        if [ -f /var/log/maas/pserv.log ]; then
-            rm -rf /var/log/maas/pserv.log
-        fi
-    fi
-
-    if dpkg --compare-versions "$2" lt 1.8.0~alpha1+bzr3523-0ubuntu1; then
-        if [ -f /etc/apache2/conf-enabled/maas-cluster-http.conf ]; then
-            rm -rf /etc/apache2/conf-enabled/maas-cluster-http.conf
-        fi
-    fi
-
-    if dpkg --compare-versions "$2" lt 2.0.0~alpha1+bzr4636-0ubuntu1; then
-        if [ -f /etc/init/maas-clusterd.conf ] || [ -f /lib/systemd/system/maas-clusterd.service ]; then
-            invoke-rc.d maas-clusterd stop
-        fi
-        if [ -f /var/log/maas/clusterd.log ]; then
-            mv /var/log/maas/clusterd.log /var/log/maas/rackd.log
-        fi
-        if [ -f /etc/maas/clusterd.conf ]; then
-            mv /etc/maas/clusterd.conf /etc/maas/rackd.conf
-        fi
-        if [ -f /usr/lib/python3/dist-packages/twisted/plugins/maasclusterd.py ]; then
-            rm -rf /usr/lib/python3/dist-packages/twisted/plugins/maasclusterd.py
-        fi
+if [ "$1" = "install" ]; then
+    if [ -f /etc/init/maas-pserv.conf ]; then
+        invoke-rc.d maas-pserv stop
+    fi
+
+    if [ -f /etc/init/maas-cluster-celery.conf ]; then
+        invoke-rc.d maas-cluster-celery stop
+    fi
+
+    if [ -f /var/log/maas/celery.log ]; then
+        rm -rf /var/log/maas/celery.log
+    fi
+
+    if [ -f /etc/init/maas-cluster.conf ]; then
+        invoke-rc.d maas-cluster stop
+    fi
+
+    if [ -f /var/log/maas/pserv.log ]; then
+        rm -rf /var/log/maas/pserv.log
+    fi
+
+    if [ -f /etc/apache2/conf-enabled/maas-cluster-http.conf ]; then
+        rm -rf /etc/apache2/conf-enabled/maas-cluster-http.conf
+    fi
+
+    if [ -f /etc/init/maas-clusterd.conf ] || [ -f /lib/systemd/system/maas-clusterd.service ]; then
+        invoke-rc.d maas-clusterd stop
+    fi
+
+    if [ -f /etc/maas/clusterd.conf ]; then
+        mv /etc/maas/clusterd.conf /etc/maas/clusterd.conf.1.10
+    fi
+
+    if [ -f /var/log/maas/clusterd.log ]; then
+        mv /var/log/maas/clusterd.log /var/log/maas/rackd.log
     fi
 
 fi

=== modified file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst	2016-02-04 10:08:48 +0000
+++ debian/maas-region-controller.postinst	2016-02-16 15:44:23 +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-rackd.conf ]; then
+if [ -f /lib/systemd/system/maas-rackd.service ]; then
     invoke-rc.d maas-rackd restart || true
 fi
 

=== modified file 'debian/rules'
--- debian/rules	2016-02-04 10:08:48 +0000
+++ debian/rules	2016-02-16 15:44:23 +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-rackd
-	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-rack-controller --name=maas-rackd
+	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-rack-controller --name=maas-rackd
+	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-rack-controller maas-rackd.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