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

[Andres Rodriguez]

Fix packaging to address templates that no longer exist

[lp:~andreserl/maas/packaging_rm_templates]

466. By Andres Rodriguez on 2016-03-25

fix typo

[Andres Rodriguez (andreserl)]

selfie!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-03-21 18:59:17 +0000
+++ debian/changelog	2016-03-25 14:13:38 +0000
@@ -1,3 +1,10 @@
+maas (2.0.0~alpha4+bzr4834-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release, 2.0.0 alpha 4 bzr4834 (Standing FFe LP: #1553261)
+  * Ensure /etc/maas/templates/power gets removed on upgrade
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 23 Mar 2016 12:27:27 -0400
+
 maas (2.0.0~alpha3+bzr4810-0ubuntu1) xenial; urgency=medium
 
   * New upstream release, 2.0.0 bzr 4810 (Standing FFe LP: #1553261)

=== modified file 'debian/maas-rack-controller.install'
--- debian/maas-rack-controller.install	2016-03-22 17:07:45 +0000
+++ debian/maas-rack-controller.install	2016-03-25 14:13:38 +0000
@@ -1,6 +1,4 @@
 # Install templates
-debian/tmp/etc/maas/templates/dhcp
-debian/tmp/etc/maas/templates/power
 debian/tmp/etc/maas/templates/pxe
 debian/tmp/etc/maas/templates/uefi
 

=== modified file 'debian/maas-rack-controller.maintscript'
--- debian/maas-rack-controller.maintscript	2016-02-10 15:56:10 +0000
+++ debian/maas-rack-controller.maintscript	2016-03-25 14:13:38 +0000
@@ -5,14 +5,5 @@
 rm_conffile /etc/init/maas-cluster.conf 1.7.0~beta6+bzr3231-0ubuntu1
 rm_conffile /etc/init/maas-cluster-register.conf 1.7.0~beta6+bzr3231-0ubuntu1
 rm_conffile /etc/maas/maas-cluster-http.conf 1.8.0~alpha1+bzr3522-0ubuntu1
-rm_conffile /etc/maas/templates/power/apc.template 1.9.0~alpha1+bzr4184-0ubuntu1
-rm_conffile /etc/maas/templates/power/mscm.template 1.9.0~alpha1+bzr4184-0ubuntu1
-rm_conffile /etc/maas/templates/power/msftocs.template 1.9.0~alpha1+bzr4184-0ubuntu1
-rm_conffile /etc/maas/templates/power/sm15k.template 1.9.0~alpha1+bzr4184-0ubuntu1
-rm_conffile /etc/maas/templates/power/ucsm.template 1.9.0~alpha1+bzr4184-0ubuntu1
-rm_conffile /etc/maas/templates/power/virsh.template 1.9.0~alpha1+bzr4184-0ubuntu1
-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-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.postrm'
--- debian/maas-rack-controller.postrm	2016-02-04 10:08:48 +0000
+++ debian/maas-rack-controller.postrm	2016-03-25 14:13:38 +0000
@@ -30,6 +30,7 @@
         # Deleting old/new config files
         rm -rf /etc/maas/pserv.yaml.maas-old
         rm -rf /etc/maas/maas_cluster.conf.maas-old
+        rm -rf /etc/maas/templates/dhcp.maas-old
         rm -rf /etc/maas/rackd.conf
 
 esac

=== modified file 'debian/maas-rack-controller.preinst'
--- debian/maas-rack-controller.preinst	2016-02-16 15:43:48 +0000
+++ debian/maas-rack-controller.preinst	2016-03-25 14:13:38 +0000
@@ -43,4 +43,14 @@
 
 fi
 
+if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
+    if [ -d /etc/maas/templates/power ]; then
+        rm -rf /etc/maas/templates/power
+    fi
+
+    if [ -d /etc/maas/templates/dhcp ]; then
+        mv /etc/maas/templates/dhcp /etc/maas/templates/dhcp.maas-old
+    fi
+fi
+
 #DEBHELPER#