Merge lp:~andreserl/maas/rename_maas-region-controller-min into lp:~maas-maintainers/maas/packaging

Proposed by Andres Rodriguez on 2016-03-25
Status: Merged
Approved by: Andres Rodriguez on 2016-03-25
Approved revision: 467
Merged at revision: 467
Proposed branch: lp:~andreserl/maas/rename_maas-region-controller-min
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 154 lines (+19/-20)
6 files modified
debian/changelog (+1/-0)
debian/control (+6/-3)
debian/maas-region-api.lintian-overrides (+5/-5)
debian/maas-region-api.maas-regiond.service (+1/-1)
debian/maas-region-api.preinst (+1/-6)
debian/rules (+5/-5)
To merge this branch: bzr merge lp:~andreserl/maas/rename_maas-region-controller-min
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve on 2016-03-25
Review via email: mp+290139@code.launchpad.net

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

Commit message

Rename maas-region-controller-min to maas-region-api

To post a comment you must log in.
LaMont Jones (lamont) wrote :

There's some dead code that could be removed, but nothing too fatal.

lamont

MAAS Lander (maas-lander) wrote :

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0. Got: 1 Pending.

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-25 17:44:04 +0000
3+++ debian/changelog 2016-03-25 18:37:49 +0000
4@@ -4,6 +4,7 @@
5 * Ensure /etc/maas/templates/power gets removed on upgrade
6 * debian/control: Update homepage and package descriptions.
7 (LP: #1562036, LP: #1562034, LP: #1562062)
8+ * Rename maas-reigon-controller-min to maas-region-api (LP: #1562069)
9
10 -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 23 Mar 2016 12:27:27 -0400
11
12
13=== modified file 'debian/control'
14--- debian/control 2016-03-25 17:44:04 +0000
15+++ debian/control 2016-03-25 18:37:49 +0000
16@@ -60,7 +60,7 @@
17 Description: MAAS server common files
18 This package contains the common files for any MAAS installation.
19
20-Package: maas-region-controller-min
21+Package: maas-region-api
22 Architecture: all
23 Depends: apache2,
24 bind9utils,
25@@ -82,6 +82,9 @@
26 ubuntu-cloudimage-keyring,
27 ${misc:Depends},
28 ${python3:Depends}
29+Conflicts: maas-region-controller-min
30+Replaces: maas-region-controller-min
31+Provides: maas-region-controller-min
32 Description: MAAS Server minimum region controller
33 This package installs and configures the minimum region controller
34 services provided by MAAS, including the web UI, caching package proxy,
35@@ -91,7 +94,7 @@
36 Architecture: all
37 Depends: dbconfig-pgsql,
38 maas-dns (= ${binary:Version}),
39- maas-region-controller-min (= ${binary:Version}),
40+ maas-region-api (= ${binary:Version}),
41 postgresql (>= 9.1),
42 ${misc:Depends},
43 Recommends: openssh-server
44@@ -253,7 +256,7 @@
45 Package: maas-dns
46 Architecture: all
47 Depends: bind9 (>= 1:9.10.3.dfsg.P2-5~),
48- maas-region-controller-min (= ${binary:Version}),
49+ maas-region-api (= ${binary:Version}),
50 ${misc:Depends}
51 Conflicts: dnsmasq
52 Description: MAAS DNS server
53
54=== renamed file 'debian/maas-region-controller-min.apport' => 'debian/maas-region-api.apport'
55=== renamed file 'debian/maas-region-controller-min.install' => 'debian/maas-region-api.install'
56=== renamed file 'debian/maas-region-controller-min.links' => 'debian/maas-region-api.links'
57=== renamed file 'debian/maas-region-controller-min.lintian-overrides' => 'debian/maas-region-api.lintian-overrides'
58--- debian/maas-region-controller-min.lintian-overrides 2015-10-07 16:07:03 +0000
59+++ debian/maas-region-api.lintian-overrides 2016-03-25 18:37:49 +0000
60@@ -1,5 +1,5 @@
61-maas-region-controller-min: binary-without-manpage usr/sbin/maas
62-maas-region-controller-min: script-not-executable etc/maas/templates/commissioning-user-data/snippets/maas_ipmi_autodetect.py
63-maas-region-controller-min: script-not-executable etc/maas/templates/commissioning-user-data/snippets/maas_signal.py
64-maas-region-controller-min: script-not-executable etc/maas/templates/commissioning-user-data/user_data.template
65-maas-region-controller-min: script-not-executable etc/maas/templates/commissioning-user-data/snippets/maas_get.py
66+maas-region-api: binary-without-manpage usr/sbin/maas
67+maas-region-api: script-not-executable etc/maas/templates/commissioning-user-data/snippets/maas_ipmi_autodetect.py
68+maas-region-api: script-not-executable etc/maas/templates/commissioning-user-data/snippets/maas_signal.py
69+maas-region-api: script-not-executable etc/maas/templates/commissioning-user-data/user_data.template
70+maas-region-api: script-not-executable etc/maas/templates/commissioning-user-data/snippets/maas_get.py
71
72=== renamed file 'debian/maas-region-controller-min.logrotate' => 'debian/maas-region-api.logrotate'
73=== renamed file 'debian/maas-region-controller-min.maas-regiond-worker@.service' => 'debian/maas-region-api.maas-regiond-worker@.service'
74=== renamed file 'debian/maas-region-controller-min.maas-regiond.service' => 'debian/maas-region-api.maas-regiond.service'
75--- debian/maas-region-controller-min.maas-regiond.service 2015-05-20 21:36:08 +0000
76+++ debian/maas-region-api.maas-regiond.service 2016-03-25 18:37:49 +0000
77@@ -10,7 +10,7 @@
78 ExecStart=/bin/true
79
80 #
81-# The maas-region-controller-min package configures four workers. This
82+# The maas-region-api package configures four workers. This
83 # should work for most people. However:
84 #
85 # * `systemctl start maas-regiond-worker@x` (where 'x' can be anything,
86
87=== renamed file 'debian/maas-region-controller-min.maintscript' => 'debian/maas-region-api.maintscript'
88=== renamed file 'debian/maas-region-controller-min.postinst' => 'debian/maas-region-api.postinst'
89=== renamed file 'debian/maas-region-controller-min.postrm' => 'debian/maas-region-api.postrm'
90=== renamed file 'debian/maas-region-controller-min.preinst' => 'debian/maas-region-api.preinst'
91--- debian/maas-region-controller-min.preinst 2015-01-15 20:35:09 +0000
92+++ debian/maas-region-api.preinst 2016-03-25 18:37:49 +0000
93@@ -4,7 +4,7 @@
94
95 . /usr/share/debconf/confmodule
96
97-if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt 1.7.0~beta4+bzr3127-0ubuntu1; then
98+if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
99
100 if [ -f /etc/init/maas-txlongpoll.conf ]; then
101 invoke-rc.d maas-txlongpoll stop
102@@ -22,11 +22,6 @@
103 rm -rf /var/log/maas/celery-region.log
104 fi
105
106-fi
107-
108-
109-if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt 1.8.0~alpha1+bzr3463-0ubuntu1; then
110-
111 if [ -f /var/log/maas/maas-django.log ]; then
112 rm -rf /var/log/maas/maas-django.log
113 fi
114
115=== renamed file 'debian/maas-region-controller-min.prerm' => 'debian/maas-region-api.prerm'
116=== renamed file 'debian/maas-region-controller-min.templates' => 'debian/maas-region-api.templates'
117=== modified file 'debian/rules'
118--- debian/rules 2016-02-10 15:56:10 +0000
119+++ debian/rules 2016-03-25 18:37:49 +0000
120@@ -13,22 +13,22 @@
121 # internet access
122
123 override_dh_installinit:
124- dh_installinit -p maas-region-controller-min --name=maas-regiond --no-start
125- dh_installinit -p maas-region-controller-min --name=maas-regiond-worker@ --no-start
126+ dh_installinit -p maas-region-api --name=maas-regiond --no-start
127+ dh_installinit -p maas-region-api --name=maas-regiond-worker@ --no-start
128 dh_installinit -p maas-rack-controller --name=maas-rackd
129 dh_installinit -p maas-proxy --name=maas-proxy
130 dh_installinit -p maas-dhcp --name=maas-dhcpd
131 dh_installinit -p maas-dhcp --name=maas-dhcpd6
132
133 override_dh_systemd_enable:
134- dh_systemd_enable -p maas-region-controller-min --name=maas-regiond
135+ dh_systemd_enable -p maas-region-api --name=maas-regiond
136 dh_systemd_enable -p maas-rack-controller --name=maas-rackd
137 dh_systemd_enable -p maas-proxy --name=maas-proxy
138 dh_systemd_enable -p maas-dhcp --name=maas-dhcpd
139 dh_systemd_enable -p maas-dhcp --name=maas-dhcpd6
140
141 override_dh_systemd_start:
142- dh_systemd_start -p maas-region-controller-min --no-start maas-regiond.service
143+ dh_systemd_start -p maas-region-api --no-start maas-regiond.service
144 dh_systemd_start -p maas-rack-controller maas-rackd.service
145 dh_systemd_start -p maas-proxy maas-proxy.service
146 dh_systemd_start -p maas-dhcp maas-dhcpd.service
147@@ -63,7 +63,7 @@
148
149 # install python3 twisted plugins
150 set -ex; for python in $(PYTHON3); do \
151- dh_install twisted/plugins/maasregiond.py usr/lib/$$python/dist-packages/twisted/plugins -pmaas-region-controller-min; \
152+ dh_install twisted/plugins/maasregiond.py usr/lib/$$python/dist-packages/twisted/plugins -pmaas-region-api; \
153 dh_install twisted/plugins/maasrackd.py usr/lib/$$python/dist-packages/twisted/plugins -pmaas-rack-controller; \
154 done
155

Subscribers

People subscribed via source and target branches

to all changes: