Merge lp:~ltrager/maas/rename-maas-nodegroup-worker into lp:~maas-committers/maas/trunk

Proposed by Lee Trager
Status: Merged
Approved by: Lee Trager
Approved revision: no longer in the source branch.
Merged at revision: 5044
Proposed branch: lp:~ltrager/maas/rename-maas-nodegroup-worker
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 60 lines (+32/-5)
2 files modified
src/maasserver/migrations/builtin/maasserver/0061_maas_nodegroup_worker_to_maas.py (+27/-0)
src/maasserver/worker_user.py (+5/-5)
To merge this branch: bzr merge lp:~ltrager/maas/rename-maas-nodegroup-worker
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+295672@code.launchpad.net

Commit message

Rename maas-nodegroup-worker to MAAS

To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'src/maasserver/migrations/builtin/maasserver/0061_maas_nodegroup_worker_to_maas.py'
2--- src/maasserver/migrations/builtin/maasserver/0061_maas_nodegroup_worker_to_maas.py 1970-01-01 00:00:00 +0000
3+++ src/maasserver/migrations/builtin/maasserver/0061_maas_nodegroup_worker_to_maas.py 2016-05-25 08:05:56 +0000
4@@ -0,0 +1,27 @@
5+# -*- coding: utf-8 -*-
6+from __future__ import unicode_literals
7+
8+from django.conf import settings
9+from django.db import (
10+ migrations,
11+ models,
12+)
13+
14+
15+def maas_nodegroup_worker_to_maas(apps, schema_editor):
16+ User = apps.get_model(settings.AUTH_USER_MODEL)
17+ for user in User.objects.filter(username='maas-nodegroup-worker'):
18+ user.username = 'MAAS'
19+ user.first_name = 'MAAS'
20+ user.email = 'maas@localhost'
21+ user.save()
22+
23+class Migration(migrations.Migration):
24+
25+ dependencies = [
26+ ('maasserver', '0060_amt_remove_mac_address'),
27+ ]
28+
29+ operations = [
30+ migrations.RunPython(maas_nodegroup_worker_to_maas),
31+ ]
32
33=== modified file 'src/maasserver/worker_user.py'
34--- src/maasserver/worker_user.py 2015-12-01 18:12:59 +0000
35+++ src/maasserver/worker_user.py 2016-05-25 08:05:56 +0000
36@@ -1,4 +1,4 @@
37-# Copyright 2012-2015 Canonical Ltd. This software is licensed under the
38+# Copyright 2012-2016 Canonical Ltd. This software is licensed under the
39 # GNU Affero General Public License version 3 (see the file LICENSE).
40
41 """System user representing node-group workers.
42@@ -14,14 +14,14 @@
43 from django.contrib.auth.models import User
44
45
46-user_name = 'maas-nodegroup-worker'
47+user_name = 'MAAS'
48
49
50 def get_worker_user():
51- """Get the system user representing the node-group workers."""
52+ """Get the system user representing the rack controller workers."""
53 worker_user, created = User.objects.get_or_create(
54 username=user_name, defaults=dict(
55- first_name="Node-group worker", last_name="Special user",
56- email="maas-nodegroup-worker@localhost", is_staff=False,
57+ first_name="MAAS", last_name="Special user",
58+ email="maas@localhost", is_staff=False,
59 is_superuser=False))
60 return worker_user