MAAS

Merge lp:~andreserl/maas/packaging_to-daemon-upgrades-region into lp:~maas-maintainers/maas/packaging

  1. packaging_to-daemon-upgrades-region
  2. Merge into packaging
Proposed by Andres Rodriguez
Status: Rejected
Rejected by: Blake Rouse
Proposed branch: lp:~andreserl/maas/packaging_to-daemon-upgrades-region
Merge into: lp:~maas-maintainers/maas/packaging
Prerequisite: lp:~andreserl/maas/packaging_to-daemon-upgrades
Diff against target: 309 lines (+43/-40)
13 files modified
debian/control (+14/-11)
debian/maas-common.templates (+2/-2)
debian/maas-region-api.apport (+1/-1)
debian/maas-region-udeb.postinst (+2/-2)
debian/maas-region.config (+4/-4)
debian/maas-region.postinst (+6/-6)
debian/maas-region.postrm (+1/-1)
debian/maas-region.prerm (+1/-1)
debian/maas-region.templates (+1/-1)
debian/maas-relay-udeb.templates (+1/-1)
debian/maas-relay.templates (+1/-1)
debian/po/POTFILES.in (+1/-1)
debian/po/templates.pot (+8/-8)
To merge this branch: bzr merge lp:~andreserl/maas/packaging_to-daemon-upgrades-region
Reviewer Review Type Date Requested Status
Andres Rodriguez Pending
Review via email: mp+301854@code.launchpad.net

This proposal supersedes a proposal from 2016-08-02.

To post a comment you must log in.

Unmerged revisions

512. By Andres Rodriguez

Change maas-region-controller for maas-region

511. By Andres Rodriguez

Handle upgrades

510. By Andres Rodriguez

* New upstream release, 2.0.0 RC4 bzr :
  - Rename MAAS Rack Controller to MAAS Relay.
* debian/*: update all packaging to replace anything that references
  maas-rack to maas-relay.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2016-08-02 23:58:53 +0000
3+++ debian/control 2016-08-02 23:58:53 +0000
4@@ -18,7 +18,7 @@
5 Package: maas
6 Architecture: all
7 Depends: maas-relay (= ${binary:Version}),
8- maas-region-controller (= ${binary:Version}),
9+ maas-region (= ${binary:Version}),
10 python3-django-maas (= ${binary:Version}),
11 ${misc:Depends}
12 Description: "Metal as a Service" is a physical cloud and IPAM
13@@ -88,12 +88,12 @@
14 Conflicts: maas-region-controller-min
15 Replaces: maas-region-controller-min
16 Provides: maas-region-controller-min
17-Description: Region controller API service for MAAS
18- The MAAS region controller consists of REST API services and a postgres
19+Description: MAAS Region API service for MAAS
20+ The MAAS region consists of REST API services and a postgres
21 database. This package installs only the API services (maas-regiond).
22- Use it to scale out the API front-end of your MAAS region controller.
23+ Use it to scale out the API front-end of your MAAS Region.
24
25-Package: maas-region-controller
26+Package: maas-region
27 Architecture: all
28 Depends: dbconfig-pgsql,
29 maas-dns (= ${binary:Version}),
30@@ -101,17 +101,20 @@
31 postgresql (>= 9.1),
32 ${misc:Depends},
33 Recommends: openssh-server
34+Breaks: maas-region-controller
35+Replaces: maas-region-controller
36+Provides: maas-region-controller
37 Description: Region Controller for MAAS
38- The MAAS region controller (maas-regiond) is the REST API server for
39+ The MAAS Region (maas-regiond) is the REST API server for
40 all MAAS clients, and the postgres database that maintains machine
41- state for the entire data centre (or “region”). The region controller
42+ state for the entire data centre (or “region”). The MAAS Region
43 an be scaled-out and highly available given the appropriate postgres
44 setup and additional API servers.
45 .
46 This package installs the postgres database and the API server, so it
47 is appropriate for the initial installation of a new MAAS region. To
48- scale out the controller or make it highly available, install
49- maas-region-controller-api on additional servers and ensure the
50+ scale out MAAS Region or make it highly available, install
51+ maas-region-api on additional servers and ensure the
52 postgres database is HA too.
53
54 Package: python3-maas-provisioningserver
55@@ -161,7 +164,7 @@
56 Replaces: maas-region-controller-min (<= 1.5+bzr1909-0ubuntu1)
57 Description: MAAS client and command-line interface
58 This package contains the 'maas' command-line interface, which
59- talks to the MAAS region controller REST API. Use the maas command
60+ talks to the MAAS Region REST API. Use the maas command
61 to login to MAAS and drive the data centre entirely from the
62 command-line.
63
64@@ -296,4 +299,4 @@
65 ${shlibs:Depends},
66 ${misc:Depends}
67 XB-Installer-Menu-Item: 2350
68-Description: Install a MAAS Rack controller (installer integration)
69+Description: Install a MAAS Relay (installer integration)
70
71=== modified file 'debian/maas-common.templates'
72--- debian/maas-common.templates 2016-08-02 23:58:53 +0000
73+++ debian/maas-common.templates 2016-08-02 23:58:53 +0000
74@@ -10,7 +10,7 @@
75 If the automatically detected address above is not in the same
76 network as the MAAS clients, you need to reconfigure it:
77 .
78- sudo dpkg-reconfigure maas-region-controller
79+ sudo dpkg-reconfigure maas-region
80
81 Template: maas/default-maas-url
82 Type: string
83@@ -49,6 +49,6 @@
84 Template: maas-relay/shared-secret
85 Type: password
86 _Description: MAAS Rack Controller Shared Secret:
87- The MAAS Relay needs to contact the MAAS region controller
88+ The MAAS Relay needs to contact the MAAS Region
89 with the shared secret found in /var/lib/maas/secret on the region controller.
90 Set the shared secret here.
91
92=== modified file 'debian/maas-region-api.apport'
93--- debian/maas-region-api.apport 2016-08-02 23:58:53 +0000
94+++ debian/maas-region-api.apport 2016-08-02 23:58:53 +0000
95@@ -1,6 +1,6 @@
96 #!/usr/bin/python
97
98-'''apport hook for maas-region-controller
99+'''apport hook for maas-region
100
101 (c) 2012-2014 Canonical Ltd.
102 Author: Andres Rodriguez <andres.rodriguez@canonical.com>
103
104=== modified file 'debian/maas-region-udeb.postinst'
105--- debian/maas-region-udeb.postinst 2016-04-07 17:24:49 +0000
106+++ debian/maas-region-udeb.postinst 2016-08-02 23:58:53 +0000
107@@ -72,8 +72,8 @@
108 db_get maas-region-udeb/password
109 password="$RET"
110 if [ -n "$password" ]; then
111- set_question maas-region-controller maas/username string "$username"
112- set_question maas-region-controller maas/password password "$password"
113+ set_question maas-region maas/username string "$username"
114+ set_question maas-region maas/password password "$password"
115 fi
116 fi
117 # Tell the package manager that we will be installing MAAS
118
119=== renamed file 'debian/maas-region-controller.config' => 'debian/maas-region.config'
120--- debian/maas-region-controller.config 2016-06-17 14:25:11 +0000
121+++ debian/maas-region.config 2016-08-02 23:58:53 +0000
122@@ -25,16 +25,16 @@
123
124 if [ "$1" = "configure" ] && [ -z "$2" ]; then
125 # Hide maas/dbconfig-install question by setting default.
126- set_question maas-region-controller/dbconfig-install true
127- set_question maas-region-controller/pgsql/app-pass ""
128- set_question maas-region-controller/remote/host "localhost"
129+ set_question maas-region/dbconfig-install true
130+ set_question maas-region/pgsql/app-pass ""
131+ set_question maas-region/remote/host "localhost"
132
133 dbc_dbname="maasdb"
134 dbc_dbuser="maas"
135 dbc_remove="true"
136
137 if [ -f /usr/share/dbconfig-common/dpkg/config.pgsql ]; then
138- dbc_go maas-region-controller $@
139+ dbc_go maas-region $@
140 fi
141
142 elif [ -n "$DEBCONF_RECONFIGURE" ]; then
143
144=== renamed file 'debian/maas-region-controller.postinst' => 'debian/maas-region.postinst'
145--- debian/maas-region-controller.postinst 2016-08-02 23:58:53 +0000
146+++ debian/maas-region.postinst 2016-08-02 23:58:53 +0000
147@@ -88,13 +88,13 @@
148 restart_postgresql
149
150 # Create the database
151- dbc_go maas-region-controller $@
152+ dbc_go maas-region $@
153 maas-region local_config_set \
154 --database-host "localhost" --database-name "$dbc_dbname" \
155 --database-user "$dbc_dbuser" --database-pass "$dbc_dbpass"
156
157 # Only syncdb if we have selected to install it with dbconfig-common.
158- db_get maas-region-controller/dbconfig-install
159+ db_get maas-region/dbconfig-install
160 if [ "$RET" = "true" ]; then
161 maas_sync_migrate_db
162 configure_migrate_maas_dns
163@@ -139,13 +139,13 @@
164 db_set maas/default-maas-url "$ipaddr"
165 fi
166 # handle database upgrade
167- if [ -f /etc/dbconfig-common/maas-region-controller.conf ]; then
168- # source dbconfig-common db config for maas-region-controller
169+ if [ -f /etc/dbconfig-common/maas-region.conf ]; then
170+ # source dbconfig-common db config for maas-region
171 # before upgrading database, otherwise a new config is written
172 # but the password is no longer preserved.
173- . /etc/dbconfig-common/maas-region-controller.conf
174+ . /etc/dbconfig-common/maas-region.conf
175 else
176- dbc_go maas-region-controller $@
177+ dbc_go maas-region $@
178 fi
179
180 # Reconfigure the config file.
181
182=== renamed file 'debian/maas-region-controller.postrm' => 'debian/maas-region.postrm'
183--- debian/maas-region-controller.postrm 2016-03-31 20:03:18 +0000
184+++ debian/maas-region.postrm 2016-08-02 23:58:53 +0000
185@@ -8,7 +8,7 @@
186
187 if [ -f /usr/share/dbconfig-common/dpkg/postrm ]; then
188 . /usr/share/dbconfig-common/dpkg/postrm.pgsql
189- dbc_go maas-region-controller $@
190+ dbc_go maas-region $@
191 fi
192
193 case "$1" in
194
195=== renamed file 'debian/maas-region-controller.prerm' => 'debian/maas-region.prerm'
196--- debian/maas-region-controller.prerm 2015-04-07 07:18:27 +0000
197+++ debian/maas-region.prerm 2016-08-02 23:58:53 +0000
198@@ -10,4 +10,4 @@
199 invoke-rc.d maas-regiond stop || true
200
201 . /usr/share/dbconfig-common/dpkg/prerm.pgsql
202-dbc_go maas-region-controller $@
203+dbc_go maas-region $@
204
205=== renamed file 'debian/maas-region-controller.templates' => 'debian/maas-region.templates'
206--- debian/maas-region-controller.templates 2016-04-26 19:37:38 +0000
207+++ debian/maas-region.templates 2016-08-02 23:58:53 +0000
208@@ -10,7 +10,7 @@
209 If the automatically detected address above is not in the same
210 network as the MAAS clients, you need to reconfigure it:
211 .
212- sudo dpkg-reconfigure maas-region-controller
213+ sudo dpkg-reconfigure maas-region
214
215 Template: maas/default-maas-url
216 Type: string
217
218=== modified file 'debian/maas-relay-udeb.templates'
219--- debian/maas-relay-udeb.templates 2016-08-02 23:58:53 +0000
220+++ debian/maas-relay-udeb.templates 2016-08-02 23:58:53 +0000
221@@ -29,6 +29,6 @@
222 Template: maas-relay-udeb/shared-secret
223 Type: password
224 _Description: MAAS Rack Controller shared secret:
225- The MAAS Relay needs to contact the MAAS region controller
226+ The MAAS Relay needs to contact the MAAS Region
227 with the shared secret found in /var/lib/maas/secret on the region controller.
228 Set the shared secret here.
229
230=== modified file 'debian/maas-relay.templates'
231--- debian/maas-relay.templates 2016-08-02 23:58:53 +0000
232+++ debian/maas-relay.templates 2016-08-02 23:58:53 +0000
233@@ -10,6 +10,6 @@
234 Template: maas-relay/shared-secret
235 Type: password
236 _Description: MAAS Rack Controller Shared Secret:
237- The MAAS Relay needs to contact the MAAS region controller
238+ The MAAS Relay needs to contact the MAAS Region
239 with the shared secret found in /var/lib/maas/secret on the region controller.
240 Set the shared secret here.
241
242=== modified file 'debian/po/POTFILES.in'
243--- debian/po/POTFILES.in 2016-04-21 02:42:48 +0000
244+++ debian/po/POTFILES.in 2016-08-02 23:58:53 +0000
245@@ -1,1 +1,1 @@
246-[type: gettext/rfc822deb] maas-region-controller.templates
247+[type: gettext/rfc822deb] maas-region.templates
248
249=== modified file 'debian/po/templates.pot'
250--- debian/po/templates.pot 2016-04-21 02:42:48 +0000
251+++ debian/po/templates.pot 2016-08-02 23:58:53 +0000
252@@ -19,13 +19,13 @@
253
254 #. Type: string
255 #. Description
256-#: ../maas-region-controller.templates:1001
257+#: ../maas-region.templates:1001
258 msgid "Ubuntu MAAS PXE/Provisioning network address:"
259 msgstr ""
260
261 #. Type: string
262 #. Description
263-#: ../maas-region-controller.templates:1001
264+#: ../maas-region.templates:1001
265 msgid ""
266 "The Ubuntu MAAS Server automatically detects the IP address that is used for "
267 "PXE and provisioning. However, it needs to be in the same network as the "
268@@ -35,7 +35,7 @@
269
270 #. Type: string
271 #. Description
272-#: ../maas-region-controller.templates:2001
273+#: ../maas-region.templates:2001
274 msgid "Ubuntu MAAS username"
275 msgstr ""
276
277@@ -43,8 +43,8 @@
278 #. Description
279 #. Type: password
280 #. Description
281-#: ../maas-region-controller.templates:2001
282-#: ../maas-region-controller.templates:3001
283+#: ../maas-region.templates:2001
284+#: ../maas-region.templates:3001
285 msgid ""
286 "The Ubuntu MAAS server requires the administrator to create a username and "
287 "password combination."
288@@ -52,18 +52,18 @@
289
290 #. Type: string
291 #. Description
292-#: ../maas-region-controller.templates:2001
293+#: ../maas-region.templates:2001
294 msgid "Please provide the username for the MAAS account."
295 msgstr ""
296
297 #. Type: password
298 #. Description
299-#: ../maas-region-controller.templates:3001
300+#: ../maas-region.templates:3001
301 msgid "Ubuntu MAAS password"
302 msgstr ""
303
304 #. Type: password
305 #. Description
306-#: ../maas-region-controller.templates:3001
307+#: ../maas-region.templates:3001
308 msgid "Please provide the password for the MAAS account."
309 msgstr ""

Subscribers

People subscribed via source and target branches

to all changes: