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

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 466
Merged at revision: 465
Proposed branch: lp:~andreserl/maas/packaging_rm_templates
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 75 lines (+18/-11)
5 files modified
debian/changelog (+7/-0)
debian/maas-rack-controller.install (+0/-2)
debian/maas-rack-controller.maintscript (+0/-9)
debian/maas-rack-controller.postrm (+1/-0)
debian/maas-rack-controller.preinst (+10/-0)
To merge this branch: bzr merge lp:~andreserl/maas/packaging_rm_templates
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+290116@code.launchpad.net

This proposal supersedes a proposal from 2016-03-25.

Commit message

Fix packaging to address templates that no longer exist

To post a comment you must log in.
466. By Andres Rodriguez on 2016-03-25

fix typo

Andres Rodriguez (andreserl) wrote :

selfie!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-03-21 18:59:17 +0000
3+++ debian/changelog 2016-03-25 14:13:38 +0000
4@@ -1,3 +1,10 @@
5+maas (2.0.0~alpha4+bzr4834-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * New upstream release, 2.0.0 alpha 4 bzr4834 (Standing FFe LP: #1553261)
8+ * Ensure /etc/maas/templates/power gets removed on upgrade
9+
10+ -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 23 Mar 2016 12:27:27 -0400
11+
12 maas (2.0.0~alpha3+bzr4810-0ubuntu1) xenial; urgency=medium
13
14 * New upstream release, 2.0.0 bzr 4810 (Standing FFe LP: #1553261)
15
16=== modified file 'debian/maas-rack-controller.install'
17--- debian/maas-rack-controller.install 2016-03-22 17:07:45 +0000
18+++ debian/maas-rack-controller.install 2016-03-25 14:13:38 +0000
19@@ -1,6 +1,4 @@
20 # Install templates
21-debian/tmp/etc/maas/templates/dhcp
22-debian/tmp/etc/maas/templates/power
23 debian/tmp/etc/maas/templates/pxe
24 debian/tmp/etc/maas/templates/uefi
25
26
27=== modified file 'debian/maas-rack-controller.maintscript'
28--- debian/maas-rack-controller.maintscript 2016-02-10 15:56:10 +0000
29+++ debian/maas-rack-controller.maintscript 2016-03-25 14:13:38 +0000
30@@ -5,14 +5,5 @@
31 rm_conffile /etc/init/maas-cluster.conf 1.7.0~beta6+bzr3231-0ubuntu1
32 rm_conffile /etc/init/maas-cluster-register.conf 1.7.0~beta6+bzr3231-0ubuntu1
33 rm_conffile /etc/maas/maas-cluster-http.conf 1.8.0~alpha1+bzr3522-0ubuntu1
34-rm_conffile /etc/maas/templates/power/apc.template 1.9.0~alpha1+bzr4184-0ubuntu1
35-rm_conffile /etc/maas/templates/power/mscm.template 1.9.0~alpha1+bzr4184-0ubuntu1
36-rm_conffile /etc/maas/templates/power/msftocs.template 1.9.0~alpha1+bzr4184-0ubuntu1
37-rm_conffile /etc/maas/templates/power/sm15k.template 1.9.0~alpha1+bzr4184-0ubuntu1
38-rm_conffile /etc/maas/templates/power/ucsm.template 1.9.0~alpha1+bzr4184-0ubuntu1
39-rm_conffile /etc/maas/templates/power/virsh.template 1.9.0~alpha1+bzr4184-0ubuntu1
40-rm_conffile /etc/maas/templates/power/vmware.template 1.9.0~alpha1+bzr4184-0ubuntu1
41-rm_conffile /etc/maas/templates/power/ipmi.conf 1.9.0~alpha1+bzr4221-0ubuntu1
42-rm_conffile /etc/maas/templates/power/ipmi.template 1.9.0~alpha1+bzr4221-0ubuntu1
43 rm_conffile /etc/init/maas-clusterd.conf 2.0.0~alpha1+bzr4635-0ubuntu1
44 rm_conffile /lib/systemd/system/maas-clusterd.service 2.0.0~alpha1+bzr4635-0ubuntu1
45
46=== modified file 'debian/maas-rack-controller.postrm'
47--- debian/maas-rack-controller.postrm 2016-02-04 10:08:48 +0000
48+++ debian/maas-rack-controller.postrm 2016-03-25 14:13:38 +0000
49@@ -30,6 +30,7 @@
50 # Deleting old/new config files
51 rm -rf /etc/maas/pserv.yaml.maas-old
52 rm -rf /etc/maas/maas_cluster.conf.maas-old
53+ rm -rf /etc/maas/templates/dhcp.maas-old
54 rm -rf /etc/maas/rackd.conf
55
56 esac
57
58=== modified file 'debian/maas-rack-controller.preinst'
59--- debian/maas-rack-controller.preinst 2016-02-16 15:43:48 +0000
60+++ debian/maas-rack-controller.preinst 2016-03-25 14:13:38 +0000
61@@ -43,4 +43,14 @@
62
63 fi
64
65+if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
66+ if [ -d /etc/maas/templates/power ]; then
67+ rm -rf /etc/maas/templates/power
68+ fi
69+
70+ if [ -d /etc/maas/templates/dhcp ]; then
71+ mv /etc/maas/templates/dhcp /etc/maas/templates/dhcp.maas-old
72+ fi
73+fi
74+
75 #DEBHELPER#

Subscribers

People subscribed via source and target branches

to all changes: