Merge lp:~andreserl/maas/packaging_to-daemon-upgrades into lp:~maas-maintainers/maas/packaging

[Andres Rodriguez]

Unmerged revisions

511. By Andres Rodriguez on 2016-08-02

Handle upgrades

510. By Andres Rodriguez on 2016-08-02

* New upstream release, 2.0.0 RC4 bzr :
  - Rename MAAS Rack Controller to MAAS Relay.
* debian/*: update all packaging to replace anything that references
  maas-rack to maas-relay.

=== modified file 'debian/control'
--- debian/control	2016-08-02 23:58:09 +0000
+++ debian/control	2016-08-02 23:58:09 +0000
@@ -205,19 +205,22 @@
 Suggests: amtterm, ipmitool, libvirt-bin, wsmancli
 Conflicts: tftpd-hpa
 Breaks: python-maas-provisioningserver,
-        maas-cluster-controller
+        maas-cluster-controller,
+        maas-rack-controller
 Replaces: python-maas-provisioningserver,
-          maas-cluster-controller
+          maas-cluster-controller,
+          maas-rack-controller
+Provides: maas-rack-controller
 Description: Rack Controller for MAAS
  The MAAS Relay (maas-relayd) provides highly available, fast
  and local broadcast services to the machines provisioned by MAAS. You
  need a MAAS Relay attached to each fabric (which is a set of
- trunked switches). You can attach multiple rack controllers to these
- physical networks for high availability, with secondary rack controllers
- automatically stepping to provide these services if the primary rack
- controller fails.
+ trunked switches). You can attach multiple MAAS relay to these
+ physical networks for high availability, with secondary MAAS relay
+ automatically stepping to provide these services if the primary MAAS
+ Relay fails.
  .
- A common configuration is to have a rack controller in each rack, with
+ A common configuration is to have a MAAS relay in each rack, with
  a fast primary network interface to the rack switch and secondary
  network interfaces on one or two other nearby racks for high
  availability redundancy.
@@ -288,6 +291,7 @@
 Package-Type: udeb
 Section: debian-installer
 Architecture: all
+Provides: maas-rack-udeb
 Depends:
  ${shlibs:Depends},
  ${misc:Depends}
 
=== modified file 'debian/maas-relay.maintscript'
--- debian/maas-relay.maintscript	2016-03-25 14:09:59 +0000
+++ debian/maas-relay.maintscript	2016-08-02 23:58:09 +0000
@@ -7,3 +7,5 @@
 rm_conffile /etc/maas/maas-cluster-http.conf 1.8.0~alpha1+bzr3522-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
+rm_conffile /etc/init/maas-rackd.conf 2.0.0~rc3+bzr5180-0ubuntu1
+rm_conffile /lib/systemd/system/maas-rackd.service 2.0.0~rc3+bzr5180-0ubuntu1
 
=== modified file 'debian/maas-relay.preinst'
--- debian/maas-relay.preinst	2016-08-02 23:58:09 +0000
+++ debian/maas-relay.preinst	2016-08-02 23:58:09 +0000
@@ -41,6 +41,18 @@
         mv /var/log/maas/clusterd.log /var/log/maas/relayd.log
     fi
 
+    if [ -f /lib/systemd/system/maas-rackd.service ]; then
+        systemctl stop maas-rackd >/dev/null 2>&1 || true
+    fi
+
+    if [ -f /etc/maas/rackd.conf ]; then
+        mv /etc/maas/rackd.conf /etc/maas/relayd.conf
+    fi
+
+    if [ -f /var/log/maas/rackd.log ]; then
+        mv /var/log/maas/rackd.log /var/log/maas/relayd.log
+    fi
+
 fi
 
 if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then