Merge lp:~andreserl/maas/maas_lp1553791_maas-region into lp:maas/trunk

Proposed by Andres Rodriguez on 2016-03-07
Status: Merged
Approved by: Andres Rodriguez on 2016-03-07
Approved revision: 4738
Merged at revision: 4738
Proposed branch: lp:~andreserl/maas/maas_lp1553791_maas-region
Merge into: lp:maas/trunk
Prerequisite: lp:~andreserl/maas/maas_lp1553791
Diff against target: 406 lines (+46/-46)
19 files modified
HACKING.txt (+7/-7)
INSTALL.txt (+1/-1)
Makefile (+14/-14)
buildout.cfg (+2/-2)
docs/conf.py (+1/-1)
docs/configure.rst (+2/-2)
docs/index.rst (+1/-1)
docs/maascli.rst (+1/-1)
docs/man/maas-region.8.rst (+3/-3)
man/maas-region.8 (+2/-2)
services/dns/run (+2/-2)
src/maas/demo.py (+1/-1)
src/maas/settings.py (+1/-1)
src/maasserver/dns/zonegenerator.py (+3/-3)
src/maasserver/management/commands/template.py (+1/-1)
src/maasserver/server_address.py (+1/-1)
src/maasserver/utils/__init__.py (+1/-1)
src/maastesting/tests/test_dbupgrade.py (+1/-1)
utilities/remote-reinstall (+1/-1)
To merge this branch: bzr merge lp:~andreserl/maas/maas_lp1553791_maas-region
Reviewer Review Type Date Requested Status
Blake Rouse (community) 2016-03-07 Approve on 2016-03-07
Review via email: mp+288309@code.launchpad.net

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

Commit message

Change references of maas-region-admin to maas-region

To post a comment you must log in.
Blake Rouse (blake-rouse) wrote :

Same as other reviews, looks good!

review: Approve
MAAS Lander (maas-lander) wrote :
Download full text (1.0 MiB)

The attempt to merge lp:~andreserl/maas/maas_lp1553791_maas-region into lp:maas failed. Below is the output from the failed tests.

Hit:1 http://security.ubuntu.com/ubuntu xenial-security InRelease
Get:2 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial InRelease [95.8 kB]
Hit:3 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease
Hit:4 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease
Get:5 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial/universe Sources [7,722 kB]
Get:6 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial/universe amd64 Packages [7,367 kB]
Get:7 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial/universe Translation-en [4,901 kB]
Fetched 20.1 MB in 5s (3,397 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb authbind bind9 bind9utils build-essential bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm postgresql pxelinux python3-all python3-apt python3-bson python3-convoy python3-coverage python3-crochet python3-cssselect python3-curtin python3-dev python3-distro-info python3-django python3-django-nose python3-django-piston3 python3-docutils python3-formencode python3-hivex python3-httplib2 python3-jinja2 python3-jsonschema python3-lxml python3-mock python3-netaddr python3-netifaces python3-oauth python3-oauthlib python3-openssl python3-paramiko python3-petname python3-pexpect python3-psycopg2 python3-pyinotify python3-pyparsing python3-pyvmomi python3-requests python3-seamicroclient python3-setuptools python3-simplestreams python3-sphinx python3-tempita python3-twisted python3-txtftp python3-tz python3-yaml python3-zope.interface python-bson python-crochet python-django python-django-piston python-djorm-ext-pgarray python-formencode python-lxml python-netaddr python-netifaces python-pocket-lint python-psycopg2 python-tempita python-twisted python-yaml socat syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
apache2 is already the newest version (2.4.18-1ubuntu1).
archdetect-deb is already the newest version (1.114ubuntu3).
authbind is already the newest version (2.1.1+nmu1).
bind9 is already the newest version (1:9.10.3.dfsg.P2-5).
bind9utils is already the newest version (1:9.10.3.dfsg.P2-5).
build-essential is already the newest version (12.1ubuntu2).
curl is already the newest version (7.47.0-1ubuntu2).
debhelper is already the newest version (9.20160115ubuntu2).
dh-apport is already the newest version (2.20-0ubuntu3).
dh-systemd is already the newest version (1.29ubuntu1).
distro-info is already the newest version (0.14build1).
dnsutils is already the newest version (1:9.10.3.dfsg.P2-5).
firefox is already the newest version (45.0+build2-0ubuntu1).
freeipmi-tools is already the newest version (1.4.11...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'HACKING.txt'
2--- HACKING.txt 2016-03-07 15:16:47 +0000
3+++ HACKING.txt 2016-03-07 15:16:47 +0000
4@@ -195,7 +195,7 @@
5
6 First create a superuser and start all MAAS services::
7
8- $ bin/maas-region-admin createadmin
9+ $ bin/maas-region createadmin
10 $ make run
11
12 Substitute your own email. The command will prompt for a choice of password.
13@@ -412,7 +412,7 @@
14
15 Generate the migration script with::
16
17- $ ./bin/maas-region-admin makemigrations --name description_of_the_change maasserver
18+ $ ./bin/maas-region makemigrations --name description_of_the_change maasserver
19
20 This will generate a migration module named
21 ``src/maasserver/migrations/builtin/<auto_number>_description_of_the_change.py``.
22@@ -432,7 +432,7 @@
23 to run Django's `makemigrations`_ command. For instance, if you want to perform
24 changes to the ``maasserver`` application, run::
25
26- $ ./bin/maas-region-admin makemigrations --empty --name description_of_the_change maasserver
27+ $ ./bin/maas-region makemigrations --empty --name description_of_the_change maasserver
28
29 This will generate a migration module named
30 ``src/maasserver/migrations/builtin/<auto_number>_description_of_the_change.py``.
31@@ -458,13 +458,13 @@
32 provide the entire schema in the initial migration. All of this logic is
33 performed on upgrade by the `dbupgrade` command.::
34
35- $ bin/maas-region-admin dbupgrade
36+ $ bin/maas-region dbupgrade
37
38 In some testing case you might need to always run the South_ migrations before
39 the Django_ migrations on a clean database. Using the `always-south` option on
40 the `dbupgrade` command allows this testing scenario.::
41
42- $ bin/maas-region-admin dbupgrade --always-south
43+ $ bin/maas-region dbupgrade --always-south
44
45 .. Note::
46
47@@ -481,14 +481,14 @@
48
49 If you need to get an interactive ``psql`` prompt, you can use `dbshell`_::
50
51- $ bin/maas-region-admin dbshell
52+ $ bin/maas-region dbshell
53
54 .. _dbshell: https://docs.djangoproject.com/en/dev/ref/django-admin/#dbshell
55
56 If you need to do the same thing with a version of MAAS you have installed
57 from the package, you can use::
58
59- $ sudo maas-region-admin dbshell --installed
60+ $ sudo maas-region dbshell --installed
61
62 You can use the ``\dt`` command to list the tables in the MAAS database. You
63 can also execute arbitrary SQL. For example:::
64
65=== modified file 'INSTALL.txt'
66--- INSTALL.txt 2016-03-07 15:16:47 +0000
67+++ INSTALL.txt 2016-03-07 15:16:47 +0000
68@@ -266,7 +266,7 @@
69 Once MAAS is installed, you'll need to create an administrator
70 account::
71
72- $ sudo maas-region-admin createadmin --username=root --email=MYEMAIL@EXAMPLE.COM
73+ $ sudo maas-region createadmin --username=root --email=MYEMAIL@EXAMPLE.COM
74
75 Substitute your own email address for MYEMAIL@EXAMPLE.COM. You may also
76 use a different username for your administrator account, but "root" is a
77
78=== modified file 'Makefile'
79--- Makefile 2016-03-07 15:16:47 +0000
80+++ Makefile 2016-03-07 15:16:47 +0000
81@@ -53,7 +53,7 @@
82 bin/maas \
83 bin/maas-probe-dhcp \
84 bin/maas-rack \
85- bin/maas-region-admin \
86+ bin/maas-region \
87 bin/twistd.rack \
88 bin/twistd.region \
89 bin/test.cli \
90@@ -95,7 +95,7 @@
91 $(buildout) install database
92 @touch --no-create $@
93
94-bin/maas-region-admin bin/twistd.region: \
95+bin/maas-region bin/twistd.region: \
96 data bin/buildout buildout.cfg versions.cfg setup.py $(js_enums)
97 $(buildout) install region
98 @touch --no-create $@
99@@ -121,10 +121,10 @@
100 $(buildout) install e2e-test
101 @touch --no-create $@
102
103-# bin/maas-region-admin is needed for South migration tests. bin/flake8 is
104+# bin/maas-region is needed for South migration tests. bin/flake8 is
105 # needed for checking lint and bin/sass is needed for checking css.
106 bin/test.testing: \
107- bin/maas-region-admin bin/flake8 bin/sass bin/buildout \
108+ bin/maas-region bin/flake8 bin/sass bin/buildout \
109 buildout.cfg versions.cfg setup.py
110 $(buildout) install testing-test
111 @touch --no-create $@
112@@ -277,11 +277,11 @@
113
114 check: clean test
115
116-docs/api.rst: bin/maas-region-admin src/maasserver/api/doc_handler.py syncdb
117- bin/maas-region-admin generate_api_doc > $@
118+docs/api.rst: bin/maas-region src/maasserver/api/doc_handler.py syncdb
119+ bin/maas-region generate_api_doc > $@
120
121-sampledata: bin/maas-region-admin bin/database syncdb
122- $(dbrun) bin/maas-region-admin generate_sample_data
123+sampledata: bin/maas-region bin/database syncdb
124+ $(dbrun) bin/maas-region generate_sample_data
125
126 doc: bin/sphinx docs/api.rst
127 bin/sphinx
128@@ -357,14 +357,14 @@
129 distclean: clean
130 $(warning 'distclean' is deprecated; use 'clean')
131
132-harness: bin/maas-region-admin bin/database
133- $(dbrun) bin/maas-region-admin shell --settings=maas.demo
134+harness: bin/maas-region bin/database
135+ $(dbrun) bin/maas-region shell --settings=maas.demo
136
137 dbharness: bin/database
138 bin/database --preserve shell
139
140-syncdb: bin/maas-region-admin bin/database
141- $(dbrun) bin/maas-region-admin dbupgrade
142+syncdb: bin/maas-region bin/database
143+ $(dbrun) bin/maas-region dbupgrade
144
145 define phony_targets
146 build
147@@ -495,9 +495,9 @@
148
149 services/reloader/@deps:
150
151-services/regiond/@deps: bin/maas-region-admin
152+services/regiond/@deps: bin/maas-region
153
154-services/regiond2/@deps: bin/maas-region-admin
155+services/regiond2/@deps: bin/maas-region
156
157 #
158 # Package building
159
160=== modified file 'buildout.cfg'
161--- buildout.cfg 2016-03-07 15:16:47 +0000
162+++ buildout.cfg 2016-03-07 15:16:47 +0000
163@@ -81,13 +81,13 @@
164 eggs =
165 ${region:test-eggs}
166 entry-points =
167- maas-region-admin=maasserver:execute_from_command_line
168+ maas-region=maasserver:execute_from_command_line
169 twistd.region=twisted.scripts.twistd:run
170 initialization =
171 ${common:initialization}
172 environ.setdefault("DJANGO_SETTINGS_MODULE", "maas.development")
173 scripts =
174- maas-region-admin
175+ maas-region
176 twistd.region
177 extra-paths =
178 ${common:extra-paths}
179
180=== modified file 'docs/conf.py'
181--- docs/conf.py 2016-02-17 16:12:30 +0000
182+++ docs/conf.py 2016-03-07 15:16:47 +0000
183@@ -281,7 +281,7 @@
184 man_pages = [
185 ('man/maas.8', 'maas', u'MAAS API commandline utility',
186 [u'Canonical 2013-2014'], 8),
187- ('man/maas-region-admin.8', 'maas-region-admin', u'MAAS administration tool',
188+ ('man/maas-region.8', 'maas-region', u'MAAS administration tool',
189 [u'Canonical 2013-2014'], 8)
190 ]
191
192
193=== modified file 'docs/configure.rst'
194--- docs/configure.rst 2015-09-08 18:41:57 +0000
195+++ docs/configure.rst 2016-03-07 15:16:47 +0000
196@@ -55,9 +55,9 @@
197
198 Ensure that the Apache config file from ``etc/maas/maas-http.conf`` is
199 included in ``/etc/apache2/conf.d/``, then set the default URL using the
200-``maas-region-admin`` command to use ``https`` instead of ``http``::
201+``maas-region`` command to use ``https`` instead of ``http``::
202
203- $ maas-region-admin local_config_set \
204+ $ maas-region local_config_set \
205 > --maas-url="https://localhost:5240/MAAS"
206
207 Now, restart Apache::
208
209=== modified file 'docs/index.rst'
210--- docs/index.rst 2015-11-10 22:30:16 +0000
211+++ docs/index.rst 2016-03-07 15:16:47 +0000
212@@ -113,7 +113,7 @@
213 .. toctree::
214 :maxdepth: 1
215
216- man/maas-region-admin.8
217+ man/maas-region.8
218 man/maas.8
219
220
221
222=== modified file 'docs/maascli.rst'
223--- docs/maascli.rst 2016-01-25 14:10:29 +0000
224+++ docs/maascli.rst 2016-03-07 15:16:47 +0000
225@@ -40,7 +40,7 @@
226 To obtain the key through the command line, run this command on the region
227 controller (it requires root access)::
228
229- $ sudo maas-region-admin apikey --username=my-username
230+ $ sudo maas-region apikey --username=my-username
231
232 (Substitute your MAAS user name for my-username).
233
234
235=== renamed file 'docs/man/maas-region-admin.8.rst' => 'docs/man/maas-region.8.rst'
236--- docs/man/maas-region-admin.8.rst 2014-05-05 16:20:18 +0000
237+++ docs/man/maas-region.8.rst 2016-03-07 15:16:47 +0000
238@@ -1,11 +1,11 @@
239-maas-region-admin
240------------------
241+maas-region
242+-----------
243
244
245 Usage
246 ^^^^^
247
248-maas-region-admin [-h, --help] createadmin | changepassword | shell
249+maas-region [-h, --help] createadmin | changepassword | shell
250
251
252 Description
253
254=== renamed file 'man/maas-region-admin.8' => 'man/maas-region.8'
255--- man/maas-region-admin.8 2015-10-15 15:17:24 +0000
256+++ man/maas-region.8 2016-03-07 15:16:47 +0000
257@@ -1,8 +1,8 @@
258 .\" Man page generated from reStructuredText.
259 .
260-.TH "MAAS-REGION-ADMIN" "8" "October 15, 2015" "dev" "MAAS"
261+.TH "MAAS-REGION" "8" "October 15, 2015" "dev" "MAAS"
262 .SH NAME
263-maas-region-admin \- MAAS administration tool
264+maas-region \- MAAS administration tool
265 .
266 .nr rst2man-indent-level 0
267 .
268
269=== modified file 'services/dns/run'
270--- services/dns/run 2015-12-11 17:13:38 +0000
271+++ services/dns/run 2016-03-07 15:16:47 +0000
272@@ -34,10 +34,10 @@
273
274 # Create MAAS' DNS config: do not overwrite an existing config file
275 # as the writing of the full configuration might have happened already.
276-bin/maas-region-admin set_up_dns --no-clobber
277+bin/maas-region set_up_dns --no-clobber
278
279 # Edit the fixture's named.conf to include MAAS' DNS config.
280-bin/maas-region-admin get_named_conf \
281+bin/maas-region get_named_conf \
282 --edit --config_path "${homedir}/named.conf"
283
284 # Run named.
285
286=== modified file 'src/maas/demo.py'
287--- src/maas/demo.py 2016-01-20 00:07:16 +0000
288+++ src/maas/demo.py 2016-03-07 15:16:47 +0000
289@@ -27,7 +27,7 @@
290 # Connect to the DHCP server. TODO: Use the signals manager instead.
291 DHCP_CONNECT = True
292
293-MAAS_CLI = abspath("bin/maas-region-admin")
294+MAAS_CLI = abspath("bin/maas-region")
295
296 # For demo purposes, give nodes unauthenticated access to their metadata
297 # even if we can't pass boot parameters. This is not safe; do not
298
299=== modified file 'src/maas/settings.py'
300--- src/maas/settings.py 2016-01-25 14:10:29 +0000
301+++ src/maas/settings.py 2016-03-07 15:16:47 +0000
302@@ -79,7 +79,7 @@
303 DHCP_CONNECT = True
304
305 # The MAAS CLI.
306-MAAS_CLI = 'sudo maas-region-admin'
307+MAAS_CLI = 'sudo maas-region'
308
309 API_URL_REGEXP = '^/api/2[.]0/'
310 METADATA_URL_REGEXP = '^/metadata/'
311
312=== modified file 'src/maasserver/dns/zonegenerator.py'
313--- src/maasserver/dns/zonegenerator.py 2016-02-18 17:31:45 +0000
314+++ src/maasserver/dns/zonegenerator.py 2016-03-07 15:16:47 +0000
315@@ -94,7 +94,7 @@
316 "The DNS server will use the address '%s', which is inside the "
317 "loopback network. This may not be a problem if you're not using "
318 "MAAS's DNS features or if you don't rely on this information. "
319- "Consult the 'maas-region-admin local_config_set --maas-url' command "
320+ "Consult the 'maas-region local_config_set --maas-url' command "
321 "for details on how to set the MAAS URL.")
322
323
324@@ -108,7 +108,7 @@
325 """Return the DNS server's IP address.
326
327 That address is derived from the config maas_url or rack_controller.url.
328- Consult the 'maas-region-admin local_config_set --maas-url' command for
329+ Consult the 'maas-region local_config_set --maas-url' command for
330 details on how to set the MAAS URL.
331
332 :param rack_controller: Optional rack controller to which the DNS server
333@@ -127,7 +127,7 @@
334 "Unable to find MAAS server IP address: %s. MAAS's DNS server "
335 "requires this IP address for the NS records in its zone files. "
336 "Make sure that the configuration setting for the MAAS URL has "
337- "the correct hostname. Consult the 'maas-region-admin "
338+ "the correct hostname. Consult the 'maas-region "
339 "local_config_set --maas-url' command."
340 % e.strerror)
341
342
343=== modified file 'src/maasserver/management/commands/template.py'
344--- src/maasserver/management/commands/template.py 2016-03-04 05:31:08 +0000
345+++ src/maasserver/management/commands/template.py 2016-03-07 15:16:47 +0000
346@@ -40,7 +40,7 @@
347 template.delete()
348 if verbosity > 0:
349 stdout.write("It would now be wise to run:\n")
350- stdout.write(" sudo maas-region-admin template update-defaults\n")
351+ stdout.write(" sudo maas-region template update-defaults\n")
352
353
354 class Command(BaseCommand):
355
356=== modified file 'src/maasserver/server_address.py'
357--- src/maasserver/server_address.py 2016-02-02 14:20:45 +0000
358+++ src/maasserver/server_address.py 2016-03-07 15:16:47 +0000
359@@ -40,7 +40,7 @@
360 """Return address where nodes and workers can reach the MAAS server.
361
362 The address is taken from the configured MAAS URL or `controller.url`.
363- Consult the 'maas-region-admin local_config_set' command for details on
364+ Consult the 'maas-region local_config_set' command for details on
365 how to set the MAAS URL.
366
367 If there is more than one IP address for the host, the addresses
368
369=== modified file 'src/maasserver/utils/__init__.py'
370--- src/maasserver/utils/__init__.py 2016-02-02 14:20:45 +0000
371+++ src/maasserver/utils/__init__.py 2016-03-07 15:16:47 +0000
372@@ -46,7 +46,7 @@
373 calls Django's 'reverse' method and prefixes the result of that call with
374 the configured MAAS URL.
375
376- Consult the 'maas-region-admin local_config_set --default-url' command for
377+ Consult the 'maas-region local_config_set --default-url' command for
378 details on how to set the MAAS URL.
379
380 :param view_name: Django's view function name/reference or URL pattern
381
382=== modified file 'src/maastesting/tests/test_dbupgrade.py'
383--- src/maastesting/tests/test_dbupgrade.py 2015-12-01 18:12:59 +0000
384+++ src/maastesting/tests/test_dbupgrade.py 2016-03-07 15:16:47 +0000
385@@ -41,7 +41,7 @@
386 env = os.environ.copy()
387 env["DEV_DB_NAME"] = "test_maas_dbupgrade"
388 env["MAAS_PREVENT_MIGRATIONS"] = "0"
389- mra = os.path.join(root, "bin", "maas-region-admin")
390+ mra = os.path.join(root, "bin", "maas-region")
391 cmd = [mra, "dbupgrade"]
392 if always_south:
393 cmd.append("--always-south")
394
395=== modified file 'utilities/remote-reinstall'
396--- utilities/remote-reinstall 2016-02-26 18:41:33 +0000
397+++ utilities/remote-reinstall 2016-03-07 15:16:47 +0000
398@@ -90,7 +90,7 @@
399 $ssh_run rm -rf /usr/share/maas/web/static/*
400 $ssh_run mv /usr/lib/python3/dist-packages/maasserver/static/* /usr/share/maas/web/static/
401 $ssh_run service maas-regiond stop
402-$ssh_run maas-region-admin migrate
403+$ssh_run maas-region migrate
404 sleep 1
405 $ssh_run service maas-regiond start
406 $ssh_run service apache2 restart