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

Proposed by Andres Rodriguez
Status: Rejected
Rejected by: Blake Rouse
Proposed branch: lp:~andreserl/maas/packaging_to-daemon
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 603 lines (+84/-81)
22 files modified
debian/changelog (+4/-1)
debian/control (+5/-5)
debian/extras/99-maas-sudoers (+3/-3)
debian/extras/maas-relay (+1/-1)
debian/maas-common.templates (+3/-3)
debian/maas-dhcp.maas-dhcpd.service (+1/-1)
debian/maas-dhcp.maas-dhcpd6.service (+1/-1)
debian/maas-region-api.apport (+4/-4)
debian/maas-region-controller.postinst (+2/-2)
debian/maas-relay-udeb.postinst (+11/-11)
debian/maas-relay-udeb.templates (+8/-8)
debian/maas-relay.config (+4/-4)
debian/maas-relay.install (+1/-1)
debian/maas-relay.links (+1/-1)
debian/maas-relay.lintian-overrides (+1/-1)
debian/maas-relay.logrotate (+1/-1)
debian/maas-relay.maas-relayd.service (+4/-4)
debian/maas-relay.postinst (+18/-18)
debian/maas-relay.postrm (+3/-3)
debian/maas-relay.preinst (+1/-1)
debian/maas-relay.templates (+3/-3)
debian/rules (+4/-4)
To merge this branch: bzr merge lp:~andreserl/maas/packaging_to-daemon
Reviewer Review Type Date Requested Status
MAAS Maintainers Pending
Review via email: mp+301850@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

510. By Andres Rodriguez on 2016-08-02

* 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/changelog'
2--- debian/changelog 2016-07-28 02:27:13 +0000
3+++ debian/changelog 2016-08-02 23:56:26 +0000
4@@ -1,6 +1,9 @@
5 maas (2.0.0~rc4+bzr5180-0ubuntu1) UNRELEASED; urgency=medium
6
7- * UNRELEASED
8+ * New upstream release, 2.0.0 RC4 bzr :
9+ - Rename MAAS Rack Controller to MAAS Relay.
10+ * debian/*: update all packaging to replace anything that references
11+ maas-rack to maas-relay.
12
13 -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 27 Jul 2016 22:26:55 -0400
14
15
16=== modified file 'debian/control'
17--- debian/control 2016-06-16 15:27:18 +0000
18+++ debian/control 2016-08-02 23:56:26 +0000
19@@ -17,7 +17,7 @@
20
21 Package: maas
22 Architecture: all
23-Depends: maas-rack-controller (= ${binary:Version}),
24+Depends: maas-relay (= ${binary:Version}),
25 maas-region-controller (= ${binary:Version}),
26 python3-django-maas (= ${binary:Version}),
27 ${misc:Depends}
28@@ -179,7 +179,7 @@
29 .
30 This package contains Python 3 modules.
31
32-Package: maas-rack-controller
33+Package: maas-relay
34 Architecture: all
35 Depends: authbind,
36 bind9utils,
37@@ -209,9 +209,9 @@
38 Replaces: python-maas-provisioningserver,
39 maas-cluster-controller
40 Description: Rack Controller for MAAS
41- The MAAS rack controller (maas-rackd) provides highly available, fast
42+ The MAAS Relay (maas-relayd) provides highly available, fast
43 and local broadcast services to the machines provisioned by MAAS. You
44- need a MAAS rack controller attached to each fabric (which is a set of
45+ need a MAAS Relay attached to each fabric (which is a set of
46 trunked switches). You can attach multiple rack controllers to these
47 physical networks for high availability, with secondary rack controllers
48 automatically stepping to provide these services if the primary rack
49@@ -284,7 +284,7 @@
50 XB-Installer-Menu-Item: 2350
51 Description: Install a MAAS server (installer integration)
52
53-Package: maas-rack-udeb
54+Package: maas-relay-udeb
55 Package-Type: udeb
56 Section: debian-installer
57 Architecture: all
58
59=== modified file 'debian/extras/99-maas-sudoers'
60--- debian/extras/99-maas-sudoers 2016-06-10 18:57:41 +0000
61+++ debian/extras/99-maas-sudoers 2016-08-02 23:56:26 +0000
62@@ -8,7 +8,7 @@
63 maas ALL= NOPASSWD: /bin/systemctl stop maas-dhcpd6
64 maas ALL= NOPASSWD: /bin/systemctl status tgt
65 maas ALL= NOPASSWD: /bin/systemctl start tgt
66-maas ALL= NOPASSWD: /bin/systemctl disable maas-rackd
67-maas ALL= NOPASSWD: /bin/systemctl stop maas-rackd
68-maas ALL= NOPASSWD: /usr/sbin/maas-rack
69+maas ALL= NOPASSWD: /bin/systemctl disable maas-relayd
70+maas ALL= NOPASSWD: /bin/systemctl stop maas-relayd
71+maas ALL= NOPASSWD: /usr/sbin/maas-relay
72 maas ALL= NOPASSWD: SETENV: /usr/sbin/tgt-admin, /usr/bin/uec2roottar
73
74=== renamed file 'debian/extras/maas-rack' => 'debian/extras/maas-relay'
75--- debian/extras/maas-rack 2016-03-17 17:14:49 +0000
76+++ debian/extras/maas-relay 2016-08-02 23:56:26 +0000
77@@ -54,7 +54,7 @@
78 if 'maas-provision' in sys.argv[0]:
79 sys.stderr.write(
80 "WARNING: The maas-provision command is deprecated and will be "
81- "removed in a future version. From now on please use 'maas-rack' "
82+ "removed in a future version. From now on please use 'maas-relay' "
83 "instead.\n")
84
85 # Allow dhcpd user to call dhcp-notify.
86
87=== modified file 'debian/maas-common.templates'
88--- debian/maas-common.templates 2016-06-02 16:34:32 +0000
89+++ debian/maas-common.templates 2016-08-02 23:56:26 +0000
90@@ -37,7 +37,7 @@
91 .
92 Please provide the password for the MAAS account.
93
94-Template: maas-rack-controller/maas-url
95+Template: maas-relay/maas-url
96 Type: string
97 _Description: Ubuntu MAAS API address:
98 The MAAS cluster controller and nodes need to contact the MAAS region
99@@ -46,9 +46,9 @@
100 Since nodes must be able to access this URL, localhost or 127.0.0.1 are not
101 useful values here.
102
103-Template: maas-rack-controller/shared-secret
104+Template: maas-relay/shared-secret
105 Type: password
106 _Description: MAAS Rack Controller Shared Secret:
107- The MAAS rack controller needs to contact the MAAS region controller
108+ The MAAS Relay needs to contact the MAAS region controller
109 with the shared secret found in /var/lib/maas/secret on the region controller.
110 Set the shared secret here.
111
112=== modified file 'debian/maas-dhcp.maas-dhcpd.service'
113--- debian/maas-dhcp.maas-dhcpd.service 2016-03-22 17:07:45 +0000
114+++ debian/maas-dhcp.maas-dhcpd.service 2016-08-02 23:56:26 +0000
115@@ -4,7 +4,7 @@
116 Wants=network-online.target
117 After=network-online.target
118 After=time-sync.target
119-BindsTo=maas-rackd.service
120+BindsTo=maas-relayd.service
121 ConditionPathExists=/var/lib/maas/dhcpd.conf
122 ConditionPathExists=/var/lib/maas/dhcpd-interfaces
123
124
125=== modified file 'debian/maas-dhcp.maas-dhcpd6.service'
126--- debian/maas-dhcp.maas-dhcpd6.service 2016-04-22 23:27:40 +0000
127+++ debian/maas-dhcp.maas-dhcpd6.service 2016-08-02 23:56:26 +0000
128@@ -4,7 +4,7 @@
129 Wants=network-online.target
130 After=network-online.target
131 After=time-sync.target
132-BindsTo=maas-rackd.service
133+BindsTo=maas-relayd.service
134 ConditionPathExists=/var/lib/maas/dhcpd6.conf
135 ConditionPathExists=/var/lib/maas/dhcpd6-interfaces
136
137
138=== modified file 'debian/maas-region-api.apport'
139--- debian/maas-region-api.apport 2016-03-25 18:26:49 +0000
140+++ debian/maas-region-api.apport 2016-08-02 23:56:26 +0000
141@@ -36,7 +36,7 @@
142
143 def add_info(report, ui):
144 response = ui.yesno(
145- "The contents of /etc/maas/regiond.conf and /etc/maas/rackd.conf "
146+ "The contents of /etc/maas/regiond.conf and /etc/maas/relayd.conf "
147 "may help developers diagnose your bug more quickly. However, it may "
148 "contain sensitive information. Do you want to include it in your bug "
149 "report?")
150@@ -50,7 +50,7 @@
151 attach_file_if_exists(
152 report, '/etc/maas/regiond.conf', 'MAASRegionConfig')
153 attach_file_if_exists(
154- report, '/etc/maas/rackd.conf', 'MAASClusterConfig')
155+ report, '/etc/maas/relayd.conf', 'MAASClusterConfig')
156 else:
157 # The user declined to include the configuration files.
158 pass
159@@ -59,14 +59,14 @@
160 attach_file_if_exists(
161 report, '/var/log/maas/regiond.log', 'MAASRegionLog')
162 attach_file_if_exists(
163- report, '/var/log/maas/rackd.log', 'MAASClusterLog')
164+ report, '/var/log/maas/relayd.log', 'MAASClusterLog')
165
166 # Attaching log files (systemd). These will overwrite the logs above on a
167 # system where systemd is available.
168 attach_journal_logs(
169 report, "MAASRegionLog", "maas-regiond", "maas-regiond-worker@*")
170 attach_journal_logs(
171- report, "MAASClusterLog", "maas-rackd")
172+ report, "MAASClusterLog", "maas-relayd")
173
174 # Attaching related packages info
175 attach_related_packages(report, ['python-django-maas', 'apparmor'])
176
177=== modified file 'debian/maas-region-controller.postinst'
178--- debian/maas-region-controller.postinst 2016-07-28 02:25:35 +0000
179+++ debian/maas-region-controller.postinst 2016-08-02 23:56:26 +0000
180@@ -165,8 +165,8 @@
181 systemctl restart maas-regiond >/dev/null || true
182 invoke-rc.d apache2 restart || true
183
184-if [ -f /lib/systemd/system/maas-rackd.service ]; then
185- systemctl restart maas-rackd >/dev/null || true
186+if [ -f /lib/systemd/system/maas-relayd.service ]; then
187+ systemctl restart maas-relayd >/dev/null || true
188 fi
189
190 db_stop
191
192=== renamed file 'debian/maas-rack-udeb.postinst' => 'debian/maas-relay-udeb.postinst'
193--- debian/maas-rack-udeb.postinst 2016-04-07 21:14:09 +0000
194+++ debian/maas-relay-udeb.postinst 2016-08-02 23:56:26 +0000
195@@ -27,20 +27,20 @@
196 1)
197 # This is a confirmation that we want to install MAAS. If we don't
198 # then we exit the MAAS installation process
199- db_input high maas-rack-udeb/rack-confirmation || true
200+ db_input high maas-relay-udeb/relay-confirmation || true
201 ;;
202 2)
203 #Ask for MAAS url
204- db_get maas-rack-udeb/rack-confirmation
205+ db_get maas-relay-udeb/relay-confirmation
206 if [ "$RET" != "true" ]; then
207 break
208 fi
209- db_input critical maas-rack-udeb/maas-url || true
210+ db_input critical maas-relay-udeb/maas-url || true
211 ;;
212
213 3)
214 # Ask for Shared Secret
215- db_input critical maas-rack-udeb/shared-secret || true
216+ db_input critical maas-relay-udeb/shared-secret || true
217 ;;
218
219 esac
220@@ -53,25 +53,25 @@
221 done
222 db_capb
223
224-db_get maas-rack-udeb/rack-confirmation
225+db_get maas-relay-udeb/relay-confirmation
226 if [ "$RET" != "true" ]; then
227- # MAAS rack controller won't be installed
228+ # MAAS Relay won't be installed
229 exit 0
230 fi
231
232-db_get maas-rack-udeb/maas-url
233+db_get maas-relay-udeb/maas-url
234 url="$RET"
235 if [ -n "$url" ]; then
236- set_question maas-rack-controller maas-rack-controller/maas-url string "$url"
237+ set_question maas-relay maas-relay/maas-url string "$url"
238 fi
239
240-db_get maas-rack-udeb/shared-secret
241+db_get maas-relay-udeb/shared-secret
242 secret="$RET"
243 if [ -n "$secret" ]; then
244- set_question maas-rack-controller maas-rack-controller/shared-secret password "$secret"
245+ set_question maas-relay maas-relay/shared-secret password "$secret"
246 fi
247
248 # Tell the package manager that we will be installing MAAS Rack Controller
249-db_set pkgsel/include maas-rack-controller
250+db_set pkgsel/include maas-relay
251 set_question tasksel tasksel/first multiselect "standard, server"
252 exit 0
253
254=== renamed file 'debian/maas-rack-udeb.templates' => 'debian/maas-relay-udeb.templates'
255--- debian/maas-rack-udeb.templates 2016-06-02 16:34:32 +0000
256+++ debian/maas-relay-udeb.templates 2016-08-02 23:56:26 +0000
257@@ -1,13 +1,13 @@
258-Template: debian-installer/maas-rack-udeb/title
259+Template: debian-installer/maas-relay-udeb/title
260 Type: text
261 _Description: Install your Metal as a Service (MAAS) Rack Controller
262
263-Template: maas-rack-udeb/rack-confirmation
264+Template: maas-relay-udeb/relay-confirmation
265 Type: boolean
266 _Description: Would you like to proceed with the installation of your MAAS Rack Controller?
267- The MAAS rack controller (maas-rackd) provides highly available, fast
268+ The MAAS Relay (maas-relayd) provides highly available, fast
269 and local broadcast services to the machines provisioned by MAAS. You
270- need a MAAS rack controller attached to each fabric (which is a set of
271+ need a MAAS Relay attached to each fabric (which is a set of
272 trunked switches). You can attach multiple rack controllers to these
273 physical networks for high availability, with secondary rack controllers
274 automatically stepping to provide these services if the primary rack
275@@ -16,19 +16,19 @@
276 By choosing to install a MAAS Rack controller, you will have to connect
277 it to a Region controller to service your machines.
278
279-Template: maas-rack-udeb/maas-url
280+Template: maas-relay-udeb/maas-url
281 Type: string
282 _Description: Ubuntu MAAS Region API address:
283- The MAAS rack controller and nodes need to contact the MAAS region
284+ The MAAS Relay and nodes need to contact the MAAS region
285 controller API. Set the URL at which they can reach the MAAS API remotely,
286 e.g. "http://192.168.1.1:5240/MAAS".
287 .
288 Since nodes must be able to access this URL, localhost or 127.0.0.1 are not
289 useful values here.
290
291-Template: maas-rack-udeb/shared-secret
292+Template: maas-relay-udeb/shared-secret
293 Type: password
294 _Description: MAAS Rack Controller shared secret:
295- The MAAS rack controller needs to contact the MAAS region controller
296+ The MAAS Relay needs to contact the MAAS region controller
297 with the shared secret found in /var/lib/maas/secret on the region controller.
298 Set the shared secret here.
299
300=== renamed file 'debian/maas-rack-controller.config' => 'debian/maas-relay.config'
301--- debian/maas-rack-controller.config 2016-03-07 22:01:56 +0000
302+++ debian/maas-relay.config 2016-08-02 23:56:26 +0000
303@@ -9,7 +9,7 @@
304 # XXX Fix to not ask when installing from the CD.
305 if ([ "$1" = "configure" ] && [ -z "$2" ]); then
306
307- db_get maas-rack-controller/maas-url || true
308+ db_get maas-relay/maas-url || true
309 if [ -z "$RET" ]; then
310 # Attempt to pre-populate if installing on the region controller.
311 if [ -f /usr/sbin/maas-region ]; then
312@@ -19,18 +19,18 @@
313 if ! echo $url | grep -qs "/MAAS$"; then
314 url="${url}/MAAS"
315 fi
316- db_set maas-rack-controller/maas-url "$url"
317+ db_set maas-relay/maas-url "$url"
318 else
319 # Will only get here if dbconf value not already set, or
320 # /etc/maas/regiond.conf doesn't exist.
321- db_input medium maas-rack-controller/maas-url || true
322+ db_input medium maas-relay/maas-url || true
323 db_go
324 fi
325 fi
326 fi
327
328 if [ "$1" = "reconfigure" ]; then
329- db_input high maas-rack-controller/maas-url || true
330+ db_input high maas-relay/maas-url || true
331 db_go
332 fi
333 #DEBHELPER#
334
335=== renamed file 'debian/maas-rack-controller.dirs' => 'debian/maas-relay.dirs'
336=== renamed file 'debian/maas-rack-controller.install' => 'debian/maas-relay.install'
337--- debian/maas-rack-controller.install 2016-03-25 14:09:59 +0000
338+++ debian/maas-relay.install 2016-08-02 23:56:26 +0000
339@@ -11,4 +11,4 @@
340 # Install all other stuff
341 debian/extras/99-maas-sudoers etc/sudoers.d
342 debian/extras/maas-probe-dhcp usr/sbin
343-debian/extras/maas-rack usr/sbin
344+debian/extras/maas-relay usr/sbin
345
346=== renamed file 'debian/maas-rack-controller.links' => 'debian/maas-relay.links'
347--- debian/maas-rack-controller.links 2016-03-07 22:01:56 +0000
348+++ debian/maas-relay.links 2016-08-02 23:56:26 +0000
349@@ -1,1 +1,1 @@
350-usr/sbin/maas-rack usr/sbin/maas-provision
351+usr/sbin/maas-relay usr/sbin/maas-provision
352
353=== renamed file 'debian/maas-rack-controller.lintian-overrides' => 'debian/maas-relay.lintian-overrides'
354--- debian/maas-rack-controller.lintian-overrides 2016-03-22 17:07:45 +0000
355+++ debian/maas-relay.lintian-overrides 2016-08-02 23:56:26 +0000
356@@ -1,1 +1,1 @@
357-maas-rack-controller: binary-without-manpage usr/bin/uec2roottar usr/sbin/maas-dhcp-helper
358+maas-relay: binary-without-manpage usr/bin/uec2roottar usr/sbin/maas-dhcp-helper
359
360=== renamed file 'debian/maas-rack-controller.logrotate' => 'debian/maas-relay.logrotate'
361--- debian/maas-rack-controller.logrotate 2016-02-04 10:08:48 +0000
362+++ debian/maas-relay.logrotate 2016-08-02 23:56:26 +0000
363@@ -1,4 +1,4 @@
364-/var/log/maas/rackd.log {
365+/var/log/maas/relayd.log {
366 rotate 5
367 weekly
368 compress
369
370=== renamed file 'debian/maas-rack-controller.maas-rackd.service' => 'debian/maas-relay.maas-relayd.service'
371--- debian/maas-rack-controller.maas-rackd.service 2016-03-31 21:53:56 +0000
372+++ debian/maas-relay.maas-relayd.service 2016-08-02 23:56:26 +0000
373@@ -9,19 +9,19 @@
374 Group=maas
375 Restart=always
376 RestartSec=10s
377-Environment="LOGFILE=/var/log/maas/rackd.log"
378-# Prevent maas-dhcpd and maas-dhcpd6 from starting until maas-rackd
379+Environment="LOGFILE=/var/log/maas/relayd.log"
380+# Prevent maas-dhcpd and maas-dhcpd6 from starting until maas-relayd
381 # has regenerated the configurations and told the services to start.
382 ExecStartPre=/bin/rm -f /var/lib/maas/dhcpd.sock
383 ExecStartPre=/bin/rm -f /var/lib/maas/dhcpd.conf
384 ExecStartPre=/bin/rm -f /var/lib/maas/dhcpd6.conf
385 # Logs go to the journal; read them with
386-# journalctl -u maas-rackd
387+# journalctl -u maas-relayd
388 # Logs also go to $LOGFILE for backward compatibility. The journal
389 # should now be preferred as the $LOGFILE will be removed in MAAS 1.9.
390 ExecStart=/bin/sh -c \
391 'exec /usr/bin/authbind --deep /usr/bin/twistd3 --nodaemon --pidfile= \
392- maas-rackd 2>&1 | tee -a $LOGFILE'
393+ maas-relayd 2>&1 | tee -a $LOGFILE'
394
395 [Install]
396 WantedBy=multi-user.target
397
398=== renamed file 'debian/maas-rack-controller.maintscript' => 'debian/maas-relay.maintscript'
399=== renamed file 'debian/maas-rack-controller.postinst' => 'debian/maas-relay.postinst'
400--- debian/maas-rack-controller.postinst 2016-04-07 01:22:47 +0000
401+++ debian/maas-relay.postinst 2016-08-02 23:56:26 +0000
402@@ -9,10 +9,10 @@
403
404 configure_logging() {
405 # Give appropriate permissions
406- if [ ! -f /var/log/maas/rackd.log ]; then
407- touch /var/log/maas/rackd.log
408+ if [ ! -f /var/log/maas/relayd.log ]; then
409+ touch /var/log/maas/relayd.log
410 fi
411- chown maas:maas /var/log/maas/rackd.log
412+ chown maas:maas /var/log/maas/relayd.log
413 }
414
415 configure_libdir() {
416@@ -73,7 +73,7 @@
417
418 configure_cluster_uuid(){
419 # This will configure a UUID if one has not previously been set.
420- maas-rack config --init
421+ maas-relay config --init
422 }
423
424 configure_cluster_authbind() {
425@@ -93,16 +93,16 @@
426
427 configure_maas_url(){
428 # Get the MAAS URL on configure/reconfigure and write it to the conf files.
429- db_get maas-rack-controller/maas-url || true
430+ db_get maas-relay/maas-url || true
431 if [ -n "$RET" ]; then
432- maas-rack config --region-url "$RET"
433+ maas-relay config --region-url "$RET"
434 fi
435 }
436
437 configure_shared_secret() {
438- db_get maas-rack-controller/shared-secret || true
439+ db_get maas-relay/shared-secret || true
440 if [ -n "$RET" ]; then
441- echo "$RET" | maas-rack install-shared-secret
442+ echo "$RET" | maas-relay install-shared-secret
443 chown maas:maas /var/lib/maas/secret
444 chmod 0640 /var/lib/maas/secret
445 fi
446@@ -114,10 +114,10 @@
447 # it with the new configuration tool.
448 if [ -f /etc/maas/maas_cluster.conf ]; then
449 uuid=$(extract_cluster_uuid /etc/maas/maas_cluster.conf)
450- maas-rack config --uuid "$uuid"
451+ maas-relay config --uuid "$uuid"
452 maas_url=$(extract_maas_url /etc/maas/maas_cluster.conf)
453- maas-rack config --region-url "$maas_url"
454- db_set maas-rack-controller/maas-url "$maas_url"
455+ maas-relay config --region-url "$maas_url"
456+ db_set maas-relay/maas-url "$maas_url"
457 mv /etc/maas/maas_cluster.conf /etc/maas/maas_cluster.conf.maas-old
458 mv /etc/maas/pserv.yaml /etc/maas/pserv.yaml.maas-old
459 fi
460@@ -125,15 +125,15 @@
461 # the maas_url and set it to debconf. Otherwise, the config file used
462 # is exactly the same.
463 if [ -f /etc/maas/clusterd.conf.1.10 ]; then
464- mv /etc/maas/clusterd.conf.1.10 /etc/maas/rackd.conf
465- maas_url=$(extract_maas_url /etc/maas/rackd.conf)
466- db_set maas-rack-controller/maas-url "$maas_url"
467+ mv /etc/maas/clusterd.conf.1.10 /etc/maas/relayd.conf
468+ maas_url=$(extract_maas_url /etc/maas/relayd.conf)
469+ db_set maas-relay/maas-url "$maas_url"
470 fi
471 }
472
473 # Unconditionally ensure that there is at least an empty configuration
474 # file. This does *not* overwrite any existing configuration.
475-maas-rack config
476+maas-relay config
477
478 if [ "$1" = "configure" ] && [ -z "$2" ]; then
479 configure_logging
480@@ -142,7 +142,7 @@
481 configure_maas_url
482 configure_cluster_uuid
483 configure_cluster_authbind
484- maas-rack upgrade-cluster
485+ maas-relay upgrade-cluster
486 upgrade_from_cluster_controller
487 configure_shared_secret
488
489@@ -151,7 +151,7 @@
490 # Only ask for a shared secret when the region is not installed
491 # on the same system.
492 if [ ! -f /usr/sbin/maas-region ]; then
493- db_input high maas-rack-controller/shared-secret
494+ db_input high maas-relay/shared-secret
495 db_go
496 fi
497 configure_shared_secret
498@@ -160,7 +160,7 @@
499 configure_logging
500 configure_libdir
501 configure_cluster_authbind
502- maas-rack upgrade-cluster
503+ maas-relay upgrade-cluster
504 fi
505
506 db_stop
507
508=== renamed file 'debian/maas-rack-controller.postrm' => 'debian/maas-relay.postrm'
509--- debian/maas-rack-controller.postrm 2016-03-31 23:55:39 +0000
510+++ debian/maas-relay.postrm 2016-08-02 23:56:26 +0000
511@@ -9,7 +9,7 @@
512 case "$1" in
513 purge)
514 # remove logfile as it wasn't installed by packaging
515- rm -rf /var/log/maas/rackd.log*
516+ rm -rf /var/log/maas/relayd.log*
517
518 # remove var directories provided it will always have files
519 # not installed or tracked by packaging
520@@ -33,8 +33,8 @@
521 rm -rf /etc/authbind/byuid/$MAAS_UID
522 fi
523
524- # Remove rackd.conf file
525- rm -rf /etc/maas/rackd.conf
526+ # Remove relayd.conf file
527+ rm -rf /etc/maas/relayd.conf
528
529 # Deleting old config files if they exist
530 if [ -f /etc/maas/pserv.yaml.maas-old ]; then
531
532=== renamed file 'debian/maas-rack-controller.preinst' => 'debian/maas-relay.preinst'
533--- debian/maas-rack-controller.preinst 2016-03-25 14:09:59 +0000
534+++ debian/maas-relay.preinst 2016-08-02 23:56:26 +0000
535@@ -38,7 +38,7 @@
536 fi
537
538 if [ -f /var/log/maas/clusterd.log ]; then
539- mv /var/log/maas/clusterd.log /var/log/maas/rackd.log
540+ mv /var/log/maas/clusterd.log /var/log/maas/relayd.log
541 fi
542
543 fi
544
545=== renamed file 'debian/maas-rack-controller.templates' => 'debian/maas-relay.templates'
546--- debian/maas-rack-controller.templates 2016-06-02 16:34:32 +0000
547+++ debian/maas-relay.templates 2016-08-02 23:56:26 +0000
548@@ -1,4 +1,4 @@
549-Template: maas-rack-controller/maas-url
550+Template: maas-relay/maas-url
551 Type: string
552 _Description: Ubuntu MAAS API address:
553 The MAAS cluster controller and nodes need to contact the MAAS region
554@@ -7,9 +7,9 @@
555 Since nodes must be able to access this URL, localhost or 127.0.0.1 are not
556 useful values here.
557
558-Template: maas-rack-controller/shared-secret
559+Template: maas-relay/shared-secret
560 Type: password
561 _Description: MAAS Rack Controller Shared Secret:
562- The MAAS rack controller needs to contact the MAAS region controller
563+ The MAAS Relay needs to contact the MAAS region controller
564 with the shared secret found in /var/lib/maas/secret on the region controller.
565 Set the shared secret here.
566
567=== modified file 'debian/rules'
568--- debian/rules 2016-07-06 13:49:52 +0000
569+++ debian/rules 2016-08-02 23:56:26 +0000
570@@ -15,21 +15,21 @@
571 override_dh_installinit:
572 dh_installinit -p maas-region-api --name=maas-regiond --no-start
573 dh_installinit -p maas-region-api --name=maas-regiond-worker@ --no-start
574- dh_installinit -p maas-rack-controller --name=maas-rackd
575+ dh_installinit -p maas-relay --name=maas-relayd
576 dh_installinit -p maas-proxy --name=maas-proxy
577 dh_installinit -p maas-dhcp --name=maas-dhcpd
578 dh_installinit -p maas-dhcp --name=maas-dhcpd6
579
580 override_dh_systemd_enable:
581 dh_systemd_enable -p maas-region-api --name=maas-regiond
582- dh_systemd_enable -p maas-rack-controller --name=maas-rackd
583+ dh_systemd_enable -p maas-relay --name=maas-relayd
584 dh_systemd_enable -p maas-proxy --name=maas-proxy
585 dh_systemd_enable -p maas-dhcp --name=maas-dhcpd
586 dh_systemd_enable -p maas-dhcp --name=maas-dhcpd6
587
588 override_dh_systemd_start:
589 dh_systemd_start -p maas-region-api --no-start maas-regiond.service
590- dh_systemd_start -p maas-rack-controller maas-rackd.service
591+ dh_systemd_start -p maas-relay maas-relayd.service
592 dh_systemd_start -p maas-proxy maas-proxy.service
593 dh_systemd_start -p maas-dhcp maas-dhcpd.service
594 dh_systemd_start -p maas-dhcp maas-dhcpd6.service
595@@ -64,7 +64,7 @@
596 # install python3 twisted plugins
597 set -ex; for python in $(PYTHON3); do \
598 dh_install twisted/plugins/maasregiond.py usr/lib/$$python/dist-packages/twisted/plugins -pmaas-region-api; \
599- dh_install twisted/plugins/maasrackd.py usr/lib/$$python/dist-packages/twisted/plugins -pmaas-rack-controller; \
600+ dh_install twisted/plugins/maasrelayd.py usr/lib/$$python/dist-packages/twisted/plugins -pmaas-relay; \
601 done
602
603 dh_install --list-missing

Subscribers

People subscribed via source and target branches

to all changes: