Merge lp:~andreserl/maas/packaging_1.10 into lp:~maas-maintainers/maas/packaging-1.10

Proposed by Andres Rodriguez on 2016-02-10
Status: Merged
Approved by: Andres Rodriguez on 2016-02-10
Approved revision: 443
Merged at revision: 443
Proposed branch: lp:~andreserl/maas/packaging_1.10
Merge into: lp:~maas-maintainers/maas/packaging-1.10
Diff against target: 128 lines (+44/-11)
6 files modified
debian/changelog (+22/-0)
debian/control (+3/-1)
debian/maas-dhcp.postinst (+2/-0)
debian/maas-proxy.install (+0/-1)
debian/maas-region-controller.postinst (+2/-1)
debian/rules (+15/-8)
To merge this branch: bzr merge lp:~andreserl/maas/packaging_1.10
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve on 2016-02-10
Review via email: mp+285622@code.launchpad.net

Commit message

* debian/rules: Correctly install init scripts.
* debian/maas-dhcp.postinst: Disable isc-dhcp-server6 too.
* debian/{maas-proxy,maas-cluster-controller}.install: No longer install
  overrides for init scripts for squid3 and isc-dhcp.
* debian/maas-region-controller.postinst: Enable maas-regiond and
  ensure we correctly restart clusterd.

To post a comment you must log in.
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-02-01 17:00:09 +0000
3+++ debian/changelog 2016-02-10 15:56:29 +0000
4@@ -1,3 +1,25 @@
5+maas (1.10.0+bzr4578-0ubuntu2) xenial; urgency=medium
6+
7+ * debian/rules: Correctly install init scripts.
8+ * debian/maas-dhcp.postinst: Disable isc-dhcp-server6 too.
9+ * debian/{maas-proxy,maas-cluster-controller}.install: No longer install
10+ overrides for init scripts for squid3 and isc-dhcp.
11+ * debian/maas-region-controller.postinst: Enable maas-regiond and
12+ ensure we correctly restart clusterd.
13+
14+ -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 10 Feb 2016 07:21:16 -0500
15+
16+maas (1.10.0+bzr4578-0ubuntu1) xenial; urgency=medium
17+
18+ * New trunk version of 1.10.0 bzr 4578:
19+ - Fix encoding issues in enlistment (LP: #1540765)
20+ - Fix issue of decoding the output of the IPMI command (LP: #1541878)
21+ - Skip block devices with duplicate serial numbers to fix
22+ multipath issue. (LP: #1526542)
23+ - BMC fails after node is commissioned (LP: #1542287)
24+
25+ -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 03 Feb 2016 18:28:22 +0100
26+
27 maas (1.10.0+bzr4572-0ubuntu2) xenial; urgency=medium
28
29 * debian/maas-region-controller.config: Ensure we truly preseed db
30
31=== modified file 'debian/control'
32--- debian/control 2016-02-01 17:00:09 +0000
33+++ debian/control 2016-02-10 15:56:29 +0000
34@@ -103,6 +103,8 @@
35 python3-pexpect,
36 python3-pyparsing,
37 python3-seamicroclient,
38+ python3-pyvmomi,
39+ python3-simplejson,
40 python3-simplestreams,
41 python3-tempita,
42 python3-twisted,
43@@ -172,7 +174,7 @@
44 wget,
45 ${misc:Depends},
46 ${python3:Depends}
47-Suggests: amtterm, ipmitool, libvirt-bin, python3-pyvmomi
48+Suggests: amtterm, ipmitool, libvirt-bin, wsmancli
49 Conflicts: tftpd-hpa
50 Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ),
51 maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 ),
52
53=== modified file 'debian/maas-dhcp.postinst'
54--- debian/maas-dhcp.postinst 2015-11-25 17:34:18 +0000
55+++ debian/maas-dhcp.postinst 2016-02-10 15:56:29 +0000
56@@ -8,6 +8,8 @@
57 # We run our own dhcpd instances.
58 systemctl stop isc-dhcp-server >/dev/null || true
59 systemctl disable isc-dhcp-server >/dev/null || true
60+ systemctl stop isc-dhcp-server6 >/dev/null || true
61+ systemctl disable isc-dhcp-server6 >/dev/null || true
62
63 dhcpd_prof="/etc/apparmor.d/usr.sbin.dhcpd"
64 if [ -f "${dhcpd_prof}" ] && command -v apparmor_parser >/dev/null 2>&1
65
66=== modified file 'debian/maas-proxy.install'
67--- debian/maas-proxy.install 2015-08-13 09:01:57 +0000
68+++ debian/maas-proxy.install 2016-02-10 15:56:29 +0000
69@@ -1,3 +1,2 @@
70 debian/extras/maas-proxy.conf usr/share/maas/
71 debian/extras/maas-proxy-common.sh usr/share/maas/
72-debian/extras/squid3.override etc/init/
73
74=== modified file 'debian/maas-region-controller.postinst'
75--- debian/maas-region-controller.postinst 2015-11-25 17:34:18 +0000
76+++ debian/maas-region-controller.postinst 2016-02-10 15:56:29 +0000
77@@ -148,10 +148,11 @@
78 configure_migrate_maas_dns
79 fi
80
81+systemctl enable maas-regiond >/dev/null || true
82 invoke-rc.d maas-regiond restart || true
83 invoke-rc.d apache2 restart || true
84
85-if [ -f /etc/init/maas-clusterd.conf ]; then
86+if [ -f /lib/systemd/system/maas-clusterd.service ]; then
87 invoke-rc.d maas-clusterd restart || true
88 fi
89
90
91=== modified file 'debian/rules'
92--- debian/rules 2016-01-29 21:03:14 +0000
93+++ debian/rules 2016-02-10 15:56:29 +0000
94@@ -13,19 +13,26 @@
95 # internet access
96
97 override_dh_installinit:
98- dh_installinit --name=maas-regiond --no-start
99- dh_installinit --name=maas-regiond-worker@ --no-start
100- dh_installinit --name=maas-clusterd
101- dh_installinit --name=maas-dhcpd
102- dh_installinit --name=maas-dhcpd6
103- dh_installinit --name=maas-proxy
104+ dh_installinit -p maas-region-controller-min --name=maas-regiond --no-start
105+ dh_installinit -p maas-region-controller-min --name=maas-regiond-worker@ --no-start
106+ dh_installinit -p maas-cluster-controller --name=maas-clusterd
107+ dh_installinit -p maas-proxy --name=maas-proxy
108+ dh_installinit -p maas-dhcp --name=maas-dhcpd
109+ dh_installinit -p maas-dhcp --name=maas-dhcpd6
110+
111+override_dh_systemd_enable:
112+ dh_systemd_enable -p maas-region-controller-min --name=maas-regiond
113+ dh_systemd_enable -p maas-cluster-controller --name=maas-clusterd
114+ dh_systemd_enable -p maas-proxy --name=maas-proxy
115+ dh_systemd_enable -p maas-dhcp --name=maas-dhcpd
116+ dh_systemd_enable -p maas-dhcp --name=maas-dhcpd6
117
118 override_dh_systemd_start:
119 dh_systemd_start -p maas-region-controller-min --no-start maas-regiond.service
120 dh_systemd_start -p maas-cluster-controller maas-clusterd.service
121- dh_systemd_start -p maas-dhcpd maas-dhcpd.service
122- dh_systemd_start -p maas-dhcpd6 maas-dhcpd6.service
123 dh_systemd_start -p maas-proxy maas-proxy.service
124+ dh_systemd_start -p maas-dhcp maas-dhcpd.service
125+ dh_systemd_start -p maas-dhcp maas-dhcpd6.service
126
127 override_dh_auto_build:
128 dh_auto_build

Subscribers

People subscribed via source and target branches