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

Proposed by Andres Rodriguez on 2016-01-31
Status: Merged
Approved by: Andres Rodriguez on 2016-01-31
Approved revision: 441
Merged at revision: 440
Proposed branch: lp:~andreserl/maas/fix_packaging_1.10_rules
Merge into: lp:~maas-maintainers/maas/packaging-1.10
Diff against target: 86 lines (+22/-27)
3 files modified
debian/changelog (+9/-2)
debian/maas-region-controller-min.maas-regiond-worker@.service (+0/-2)
debian/rules (+13/-23)
To merge this branch: bzr merge lp:~andreserl/maas/fix_packaging_1.10_rules
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve on 2016-01-31
Review via email: mp+284546@code.launchpad.net

Commit message

* debian/maas-region-controller-min.maas-regiond-worker@.service: Don't
  depend on postgresql.service anymore, as it would prevent regiond
  to run on machines with a remote PostgreSQL.
* debian/rules: Refactor installation of init scripts so that they are
  correctly handled, and maas-regiond is not started on install.

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-01-26 23:35:50 +0000
3+++ debian/changelog 2016-01-31 23:48:44 +0000
4@@ -1,6 +1,8 @@
5-maas (1.10.0~alpha1+bzr4570-0ubuntu1) UNRELEASED; urgency=medium
6+maas (1.10.0+bzr4570-0ubuntu1) xenial; urgency=medium
7
8- * UNRELEASED
9+ * New upstram release, 1.10.0 bzr 4570:
10+ - Support python3, drop support for python2.
11+ - Support django 1.8+.
12 * debian/control:
13 - Remove all Upstart related services.
14 - Remove python-django16 dependency.
15@@ -9,6 +11,11 @@
16 - Depends on dbconfig-pgsql instead of dbconfig-common.
17 * debian/maas-region-controller.config:
18 - Preseed dbconfig common to not ask for PG server to use.
19+ * debian/maas-region-controller-min.maas-regiond-worker@.service: Don't
20+ depend on postgresql.service anymore, as it would prevent regiond
21+ to run on machines with a remote PostgreSQL.
22+ * debian/rules: Refactor installation of init scripts so that they are
23+ correctly handled, and maas-regiond is not started on install.
24
25 -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 13 Nov 2015 13:13:42 +0000
26
27
28=== modified file 'debian/maas-region-controller-min.maas-regiond-worker@.service'
29--- debian/maas-region-controller-min.maas-regiond-worker@.service 2015-12-09 02:18:13 +0000
30+++ debian/maas-region-controller-min.maas-regiond-worker@.service 2016-01-31 23:48:44 +0000
31@@ -3,8 +3,6 @@
32 Documentation=https://maas.ubuntu.com/
33 Requires=network-online.target
34 After=network-online.target
35-Requires=postgresql.service
36-After=postgresql.service
37 PartOf=maas-regiond.service
38 # This will go away one we support new config files.
39 ConditionPathExists=/etc/maas/regiond.conf
40
41=== modified file 'debian/rules'
42--- debian/rules 2015-12-21 23:32:10 +0000
43+++ debian/rules 2016-01-31 23:48:44 +0000
44@@ -13,29 +13,19 @@
45 # internet access
46
47 override_dh_installinit:
48- # maas-clusterd
49- dh_systemd_enable --name maas-clusterd
50- dh_installinit --name maas-clusterd
51- dh_systemd_start --name maas-clusterd
52- # maas-regiond
53- dh_systemd_enable --name maas-regiond
54- dh_installinit --name maas-regiond
55- dh_systemd_start --name maas-regiond
56- # maas-regiond-worker
57- dh_installinit --no-start --name maas-regiond-worker # Upstart
58- dh_installinit --no-start --name maas-regiond-worker@ # systemd
59- # maas-dhcpd
60- dh_systemd_enable --name maas-dhcpd
61- dh_installinit --name maas-dhcpd
62- dh_systemd_start --name maas-dhcpd
63- # maas-dhcpd6
64- dh_systemd_enable --name maas-dhcpd6
65- dh_installinit --name maas-dhcpd6
66- dh_systemd_start --name maas-dhcpd6
67- # maas-proxy
68- dh_systemd_enable --name maas-proxy
69- dh_installinit --name maas-proxy
70- dh_systemd_start --name maas-proxy
71+ dh_installinit --name=maas-regiond --no-start
72+ dh_installinit --name=maas-regiond-worker@ --no-start
73+ dh_installinit --name=maas-clusterd
74+ dh_installinit --name=maas-dhcpd
75+ dh_installinit --name=maas-dhcpd6
76+ dh_installinit --name=maas-proxy
77+
78+override_dh_systemd_start:
79+ dh_systemd_start -p maas-region-controller-min --no-start maas-regiond.service
80+ dh_systemd_start -p maas-cluster-controller maas-clusterd.service
81+ dh_systemd_start -p maas-dhcpd maas-dhcpd.service
82+ dh_systemd_start -p maas-dhcpd6 maas-dhcpd6.service
83+ dh_systemd_start -p maas-proxy maas-proxy.service
84
85 override_dh_auto_build:
86 dh_auto_build

Subscribers

People subscribed via source and target branches