MAAS

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

  1. maas_lp1553791_maas-region
  2. Merge into trunk
Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: no longer in the source branch.
Merged at revision: 4738
Proposed branch: lp:~andreserl/maas/maas_lp1553791_maas-region
Merge into: lp:~maas-committers/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) Approve
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.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

https://code.launchpad.net/~andreserl/maas/lp1553791/+merge/288296

Revision history for this message
Blake Rouse (blake-rouse) wrote :

Same as other reviews, looks good!

review: Approve
Revision history for this message
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
=== modified file 'HACKING.txt'
--- HACKING.txt 2016-03-07 15:16:47 +0000
+++ HACKING.txt 2016-03-07 15:16:47 +0000
@@ -195,7 +195,7 @@
195195
196First create a superuser and start all MAAS services::196First create a superuser and start all MAAS services::
197197
198 $ bin/maas-region-admin createadmin198 $ bin/maas-region createadmin
199 $ make run199 $ make run
200200
201Substitute your own email. The command will prompt for a choice of password.201Substitute your own email. The command will prompt for a choice of password.
@@ -412,7 +412,7 @@
412412
413Generate the migration script with::413Generate the migration script with::
414414
415 $ ./bin/maas-region-admin makemigrations --name description_of_the_change maasserver415 $ ./bin/maas-region makemigrations --name description_of_the_change maasserver
416416
417This will generate a migration module named417This will generate a migration module named
418``src/maasserver/migrations/builtin/<auto_number>_description_of_the_change.py``.418``src/maasserver/migrations/builtin/<auto_number>_description_of_the_change.py``.
@@ -432,7 +432,7 @@
432to run Django's `makemigrations`_ command. For instance, if you want to perform432to run Django's `makemigrations`_ command. For instance, if you want to perform
433changes to the ``maasserver`` application, run::433changes to the ``maasserver`` application, run::
434434
435 $ ./bin/maas-region-admin makemigrations --empty --name description_of_the_change maasserver435 $ ./bin/maas-region makemigrations --empty --name description_of_the_change maasserver
436436
437This will generate a migration module named437This will generate a migration module named
438``src/maasserver/migrations/builtin/<auto_number>_description_of_the_change.py``.438``src/maasserver/migrations/builtin/<auto_number>_description_of_the_change.py``.
@@ -458,13 +458,13 @@
458provide the entire schema in the initial migration. All of this logic is458provide the entire schema in the initial migration. All of this logic is
459performed on upgrade by the `dbupgrade` command.::459performed on upgrade by the `dbupgrade` command.::
460460
461 $ bin/maas-region-admin dbupgrade461 $ bin/maas-region dbupgrade
462462
463In some testing case you might need to always run the South_ migrations before463In some testing case you might need to always run the South_ migrations before
464the Django_ migrations on a clean database. Using the `always-south` option on464the Django_ migrations on a clean database. Using the `always-south` option on
465the `dbupgrade` command allows this testing scenario.::465the `dbupgrade` command allows this testing scenario.::
466466
467 $ bin/maas-region-admin dbupgrade --always-south467 $ bin/maas-region dbupgrade --always-south
468468
469.. Note::469.. Note::
470470
@@ -481,14 +481,14 @@
481481
482If you need to get an interactive ``psql`` prompt, you can use `dbshell`_::482If you need to get an interactive ``psql`` prompt, you can use `dbshell`_::
483483
484 $ bin/maas-region-admin dbshell484 $ bin/maas-region dbshell
485485
486.. _dbshell: https://docs.djangoproject.com/en/dev/ref/django-admin/#dbshell486.. _dbshell: https://docs.djangoproject.com/en/dev/ref/django-admin/#dbshell
487487
488If you need to do the same thing with a version of MAAS you have installed488If you need to do the same thing with a version of MAAS you have installed
489from the package, you can use::489from the package, you can use::
490490
491 $ sudo maas-region-admin dbshell --installed491 $ sudo maas-region dbshell --installed
492492
493You can use the ``\dt`` command to list the tables in the MAAS database. You493You can use the ``\dt`` command to list the tables in the MAAS database. You
494can also execute arbitrary SQL. For example:::494can also execute arbitrary SQL. For example:::
495495
=== modified file 'INSTALL.txt'
--- INSTALL.txt 2016-03-07 15:16:47 +0000
+++ INSTALL.txt 2016-03-07 15:16:47 +0000
@@ -266,7 +266,7 @@
266Once MAAS is installed, you'll need to create an administrator266Once MAAS is installed, you'll need to create an administrator
267account::267account::
268268
269 $ sudo maas-region-admin createadmin --username=root --email=MYEMAIL@EXAMPLE.COM269 $ sudo maas-region createadmin --username=root --email=MYEMAIL@EXAMPLE.COM
270270
271Substitute your own email address for MYEMAIL@EXAMPLE.COM. You may also271Substitute your own email address for MYEMAIL@EXAMPLE.COM. You may also
272use a different username for your administrator account, but "root" is a272use a different username for your administrator account, but "root" is a
273273
=== modified file 'Makefile'
--- Makefile 2016-03-07 15:16:47 +0000
+++ Makefile 2016-03-07 15:16:47 +0000
@@ -53,7 +53,7 @@
53 bin/maas \53 bin/maas \
54 bin/maas-probe-dhcp \54 bin/maas-probe-dhcp \
55 bin/maas-rack \55 bin/maas-rack \
56 bin/maas-region-admin \56 bin/maas-region \
57 bin/twistd.rack \57 bin/twistd.rack \
58 bin/twistd.region \58 bin/twistd.region \
59 bin/test.cli \59 bin/test.cli \
@@ -95,7 +95,7 @@
95 $(buildout) install database95 $(buildout) install database
96 @touch --no-create $@96 @touch --no-create $@
9797
98bin/maas-region-admin bin/twistd.region: \98bin/maas-region bin/twistd.region: \
99 data bin/buildout buildout.cfg versions.cfg setup.py $(js_enums)99 data bin/buildout buildout.cfg versions.cfg setup.py $(js_enums)
100 $(buildout) install region100 $(buildout) install region
101 @touch --no-create $@101 @touch --no-create $@
@@ -121,10 +121,10 @@
121 $(buildout) install e2e-test121 $(buildout) install e2e-test
122 @touch --no-create $@122 @touch --no-create $@
123123
124# bin/maas-region-admin is needed for South migration tests. bin/flake8 is124# bin/maas-region is needed for South migration tests. bin/flake8 is
125# needed for checking lint and bin/sass is needed for checking css.125# needed for checking lint and bin/sass is needed for checking css.
126bin/test.testing: \126bin/test.testing: \
127 bin/maas-region-admin bin/flake8 bin/sass bin/buildout \127 bin/maas-region bin/flake8 bin/sass bin/buildout \
128 buildout.cfg versions.cfg setup.py128 buildout.cfg versions.cfg setup.py
129 $(buildout) install testing-test129 $(buildout) install testing-test
130 @touch --no-create $@130 @touch --no-create $@
@@ -277,11 +277,11 @@
277277
278check: clean test278check: clean test
279279
280docs/api.rst: bin/maas-region-admin src/maasserver/api/doc_handler.py syncdb280docs/api.rst: bin/maas-region src/maasserver/api/doc_handler.py syncdb
281 bin/maas-region-admin generate_api_doc > $@281 bin/maas-region generate_api_doc > $@
282282
283sampledata: bin/maas-region-admin bin/database syncdb283sampledata: bin/maas-region bin/database syncdb
284 $(dbrun) bin/maas-region-admin generate_sample_data284 $(dbrun) bin/maas-region generate_sample_data
285285
286doc: bin/sphinx docs/api.rst286doc: bin/sphinx docs/api.rst
287 bin/sphinx287 bin/sphinx
@@ -357,14 +357,14 @@
357distclean: clean357distclean: clean
358 $(warning 'distclean' is deprecated; use 'clean')358 $(warning 'distclean' is deprecated; use 'clean')
359359
360harness: bin/maas-region-admin bin/database360harness: bin/maas-region bin/database
361 $(dbrun) bin/maas-region-admin shell --settings=maas.demo361 $(dbrun) bin/maas-region shell --settings=maas.demo
362362
363dbharness: bin/database363dbharness: bin/database
364 bin/database --preserve shell364 bin/database --preserve shell
365365
366syncdb: bin/maas-region-admin bin/database366syncdb: bin/maas-region bin/database
367 $(dbrun) bin/maas-region-admin dbupgrade367 $(dbrun) bin/maas-region dbupgrade
368368
369define phony_targets369define phony_targets
370 build370 build
@@ -495,9 +495,9 @@
495495
496services/reloader/@deps:496services/reloader/@deps:
497497
498services/regiond/@deps: bin/maas-region-admin498services/regiond/@deps: bin/maas-region
499499
500services/regiond2/@deps: bin/maas-region-admin500services/regiond2/@deps: bin/maas-region
501501
502#502#
503# Package building503# Package building
504504
=== modified file 'buildout.cfg'
--- buildout.cfg 2016-03-07 15:16:47 +0000
+++ buildout.cfg 2016-03-07 15:16:47 +0000
@@ -81,13 +81,13 @@
81eggs =81eggs =
82 ${region:test-eggs}82 ${region:test-eggs}
83entry-points =83entry-points =
84 maas-region-admin=maasserver:execute_from_command_line84 maas-region=maasserver:execute_from_command_line
85 twistd.region=twisted.scripts.twistd:run85 twistd.region=twisted.scripts.twistd:run
86initialization =86initialization =
87 ${common:initialization}87 ${common:initialization}
88 environ.setdefault("DJANGO_SETTINGS_MODULE", "maas.development")88 environ.setdefault("DJANGO_SETTINGS_MODULE", "maas.development")
89scripts =89scripts =
90 maas-region-admin90 maas-region
91 twistd.region91 twistd.region
92extra-paths =92extra-paths =
93 ${common:extra-paths}93 ${common:extra-paths}
9494
=== modified file 'docs/conf.py'
--- docs/conf.py 2016-02-17 16:12:30 +0000
+++ docs/conf.py 2016-03-07 15:16:47 +0000
@@ -281,7 +281,7 @@
281man_pages = [281man_pages = [
282 ('man/maas.8', 'maas', u'MAAS API commandline utility',282 ('man/maas.8', 'maas', u'MAAS API commandline utility',
283 [u'Canonical 2013-2014'], 8),283 [u'Canonical 2013-2014'], 8),
284 ('man/maas-region-admin.8', 'maas-region-admin', u'MAAS administration tool',284 ('man/maas-region.8', 'maas-region', u'MAAS administration tool',
285 [u'Canonical 2013-2014'], 8)285 [u'Canonical 2013-2014'], 8)
286]286]
287287
288288
=== modified file 'docs/configure.rst'
--- docs/configure.rst 2015-09-08 18:41:57 +0000
+++ docs/configure.rst 2016-03-07 15:16:47 +0000
@@ -55,9 +55,9 @@
5555
56Ensure that the Apache config file from ``etc/maas/maas-http.conf`` is56Ensure that the Apache config file from ``etc/maas/maas-http.conf`` is
57included in ``/etc/apache2/conf.d/``, then set the default URL using the57included in ``/etc/apache2/conf.d/``, then set the default URL using the
58``maas-region-admin`` command to use ``https`` instead of ``http``::58``maas-region`` command to use ``https`` instead of ``http``::
5959
60 $ maas-region-admin local_config_set \60 $ maas-region local_config_set \
61 > --maas-url="https://localhost:5240/MAAS"61 > --maas-url="https://localhost:5240/MAAS"
6262
63Now, restart Apache::63Now, restart Apache::
6464
=== modified file 'docs/index.rst'
--- docs/index.rst 2015-11-10 22:30:16 +0000
+++ docs/index.rst 2016-03-07 15:16:47 +0000
@@ -113,7 +113,7 @@
113.. toctree::113.. toctree::
114 :maxdepth: 1114 :maxdepth: 1
115115
116 man/maas-region-admin.8116 man/maas-region.8
117 man/maas.8117 man/maas.8
118118
119119
120120
=== modified file 'docs/maascli.rst'
--- docs/maascli.rst 2016-01-25 14:10:29 +0000
+++ docs/maascli.rst 2016-03-07 15:16:47 +0000
@@ -40,7 +40,7 @@
40To obtain the key through the command line, run this command on the region40To obtain the key through the command line, run this command on the region
41controller (it requires root access)::41controller (it requires root access)::
4242
43 $ sudo maas-region-admin apikey --username=my-username43 $ sudo maas-region apikey --username=my-username
4444
45(Substitute your MAAS user name for my-username).45(Substitute your MAAS user name for my-username).
4646
4747
=== renamed file 'docs/man/maas-region-admin.8.rst' => 'docs/man/maas-region.8.rst'
--- docs/man/maas-region-admin.8.rst 2014-05-05 16:20:18 +0000
+++ docs/man/maas-region.8.rst 2016-03-07 15:16:47 +0000
@@ -1,11 +1,11 @@
1maas-region-admin1maas-region
2-----------------2-----------
33
44
5Usage5Usage
6^^^^^6^^^^^
77
8maas-region-admin [-h, --help] createadmin | changepassword | shell8maas-region [-h, --help] createadmin | changepassword | shell
99
1010
11Description11Description
1212
=== renamed file 'man/maas-region-admin.8' => 'man/maas-region.8'
--- man/maas-region-admin.8 2015-10-15 15:17:24 +0000
+++ man/maas-region.8 2016-03-07 15:16:47 +0000
@@ -1,8 +1,8 @@
1.\" Man page generated from reStructuredText.1.\" Man page generated from reStructuredText.
2.2.
3.TH "MAAS-REGION-ADMIN" "8" "October 15, 2015" "dev" "MAAS"3.TH "MAAS-REGION" "8" "October 15, 2015" "dev" "MAAS"
4.SH NAME4.SH NAME
5maas-region-admin \- MAAS administration tool5maas-region \- MAAS administration tool
6.6.
7.nr rst2man-indent-level 07.nr rst2man-indent-level 0
8.8.
99
=== modified file 'services/dns/run'
--- services/dns/run 2015-12-11 17:13:38 +0000
+++ services/dns/run 2016-03-07 15:16:47 +0000
@@ -34,10 +34,10 @@
3434
35# Create MAAS' DNS config: do not overwrite an existing config file35# Create MAAS' DNS config: do not overwrite an existing config file
36# as the writing of the full configuration might have happened already.36# as the writing of the full configuration might have happened already.
37bin/maas-region-admin set_up_dns --no-clobber37bin/maas-region set_up_dns --no-clobber
3838
39# Edit the fixture's named.conf to include MAAS' DNS config.39# Edit the fixture's named.conf to include MAAS' DNS config.
40bin/maas-region-admin get_named_conf \40bin/maas-region get_named_conf \
41 --edit --config_path "${homedir}/named.conf"41 --edit --config_path "${homedir}/named.conf"
4242
43# Run named.43# Run named.
4444
=== modified file 'src/maas/demo.py'
--- src/maas/demo.py 2016-01-20 00:07:16 +0000
+++ src/maas/demo.py 2016-03-07 15:16:47 +0000
@@ -27,7 +27,7 @@
27# Connect to the DHCP server. TODO: Use the signals manager instead.27# Connect to the DHCP server. TODO: Use the signals manager instead.
28DHCP_CONNECT = True28DHCP_CONNECT = True
2929
30MAAS_CLI = abspath("bin/maas-region-admin")30MAAS_CLI = abspath("bin/maas-region")
3131
32# For demo purposes, give nodes unauthenticated access to their metadata32# For demo purposes, give nodes unauthenticated access to their metadata
33# even if we can't pass boot parameters. This is not safe; do not33# even if we can't pass boot parameters. This is not safe; do not
3434
=== modified file 'src/maas/settings.py'
--- src/maas/settings.py 2016-01-25 14:10:29 +0000
+++ src/maas/settings.py 2016-03-07 15:16:47 +0000
@@ -79,7 +79,7 @@
79DHCP_CONNECT = True79DHCP_CONNECT = True
8080
81# The MAAS CLI.81# The MAAS CLI.
82MAAS_CLI = 'sudo maas-region-admin'82MAAS_CLI = 'sudo maas-region'
8383
84API_URL_REGEXP = '^/api/2[.]0/'84API_URL_REGEXP = '^/api/2[.]0/'
85METADATA_URL_REGEXP = '^/metadata/'85METADATA_URL_REGEXP = '^/metadata/'
8686
=== modified file 'src/maasserver/dns/zonegenerator.py'
--- src/maasserver/dns/zonegenerator.py 2016-02-18 17:31:45 +0000
+++ src/maasserver/dns/zonegenerator.py 2016-03-07 15:16:47 +0000
@@ -94,7 +94,7 @@
94 "The DNS server will use the address '%s', which is inside the "94 "The DNS server will use the address '%s', which is inside the "
95 "loopback network. This may not be a problem if you're not using "95 "loopback network. This may not be a problem if you're not using "
96 "MAAS's DNS features or if you don't rely on this information. "96 "MAAS's DNS features or if you don't rely on this information. "
97 "Consult the 'maas-region-admin local_config_set --maas-url' command "97 "Consult the 'maas-region local_config_set --maas-url' command "
98 "for details on how to set the MAAS URL.")98 "for details on how to set the MAAS URL.")
9999
100100
@@ -108,7 +108,7 @@
108 """Return the DNS server's IP address.108 """Return the DNS server's IP address.
109109
110 That address is derived from the config maas_url or rack_controller.url.110 That address is derived from the config maas_url or rack_controller.url.
111 Consult the 'maas-region-admin local_config_set --maas-url' command for111 Consult the 'maas-region local_config_set --maas-url' command for
112 details on how to set the MAAS URL.112 details on how to set the MAAS URL.
113113
114 :param rack_controller: Optional rack controller to which the DNS server114 :param rack_controller: Optional rack controller to which the DNS server
@@ -127,7 +127,7 @@
127 "Unable to find MAAS server IP address: %s. MAAS's DNS server "127 "Unable to find MAAS server IP address: %s. MAAS's DNS server "
128 "requires this IP address for the NS records in its zone files. "128 "requires this IP address for the NS records in its zone files. "
129 "Make sure that the configuration setting for the MAAS URL has "129 "Make sure that the configuration setting for the MAAS URL has "
130 "the correct hostname. Consult the 'maas-region-admin "130 "the correct hostname. Consult the 'maas-region "
131 "local_config_set --maas-url' command."131 "local_config_set --maas-url' command."
132 % e.strerror)132 % e.strerror)
133133
134134
=== modified file 'src/maasserver/management/commands/template.py'
--- src/maasserver/management/commands/template.py 2016-03-04 05:31:08 +0000
+++ src/maasserver/management/commands/template.py 2016-03-07 15:16:47 +0000
@@ -40,7 +40,7 @@
40 template.delete()40 template.delete()
41 if verbosity > 0:41 if verbosity > 0:
42 stdout.write("It would now be wise to run:\n")42 stdout.write("It would now be wise to run:\n")
43 stdout.write(" sudo maas-region-admin template update-defaults\n")43 stdout.write(" sudo maas-region template update-defaults\n")
4444
4545
46class Command(BaseCommand):46class Command(BaseCommand):
4747
=== modified file 'src/maasserver/server_address.py'
--- src/maasserver/server_address.py 2016-02-02 14:20:45 +0000
+++ src/maasserver/server_address.py 2016-03-07 15:16:47 +0000
@@ -40,7 +40,7 @@
40 """Return address where nodes and workers can reach the MAAS server.40 """Return address where nodes and workers can reach the MAAS server.
4141
42 The address is taken from the configured MAAS URL or `controller.url`.42 The address is taken from the configured MAAS URL or `controller.url`.
43 Consult the 'maas-region-admin local_config_set' command for details on43 Consult the 'maas-region local_config_set' command for details on
44 how to set the MAAS URL.44 how to set the MAAS URL.
4545
46 If there is more than one IP address for the host, the addresses46 If there is more than one IP address for the host, the addresses
4747
=== modified file 'src/maasserver/utils/__init__.py'
--- src/maasserver/utils/__init__.py 2016-02-02 14:20:45 +0000
+++ src/maasserver/utils/__init__.py 2016-03-07 15:16:47 +0000
@@ -46,7 +46,7 @@
46 calls Django's 'reverse' method and prefixes the result of that call with46 calls Django's 'reverse' method and prefixes the result of that call with
47 the configured MAAS URL.47 the configured MAAS URL.
4848
49 Consult the 'maas-region-admin local_config_set --default-url' command for49 Consult the 'maas-region local_config_set --default-url' command for
50 details on how to set the MAAS URL.50 details on how to set the MAAS URL.
5151
52 :param view_name: Django's view function name/reference or URL pattern52 :param view_name: Django's view function name/reference or URL pattern
5353
=== modified file 'src/maastesting/tests/test_dbupgrade.py'
--- src/maastesting/tests/test_dbupgrade.py 2015-12-01 18:12:59 +0000
+++ src/maastesting/tests/test_dbupgrade.py 2016-03-07 15:16:47 +0000
@@ -41,7 +41,7 @@
41 env = os.environ.copy()41 env = os.environ.copy()
42 env["DEV_DB_NAME"] = "test_maas_dbupgrade"42 env["DEV_DB_NAME"] = "test_maas_dbupgrade"
43 env["MAAS_PREVENT_MIGRATIONS"] = "0"43 env["MAAS_PREVENT_MIGRATIONS"] = "0"
44 mra = os.path.join(root, "bin", "maas-region-admin")44 mra = os.path.join(root, "bin", "maas-region")
45 cmd = [mra, "dbupgrade"]45 cmd = [mra, "dbupgrade"]
46 if always_south:46 if always_south:
47 cmd.append("--always-south")47 cmd.append("--always-south")
4848
=== modified file 'utilities/remote-reinstall'
--- utilities/remote-reinstall 2016-02-26 18:41:33 +0000
+++ utilities/remote-reinstall 2016-03-07 15:16:47 +0000
@@ -90,7 +90,7 @@
90$ssh_run rm -rf /usr/share/maas/web/static/*90$ssh_run rm -rf /usr/share/maas/web/static/*
91$ssh_run mv /usr/lib/python3/dist-packages/maasserver/static/* /usr/share/maas/web/static/91$ssh_run mv /usr/lib/python3/dist-packages/maasserver/static/* /usr/share/maas/web/static/
92$ssh_run service maas-regiond stop92$ssh_run service maas-regiond stop
93$ssh_run maas-region-admin migrate93$ssh_run maas-region migrate
94sleep 194sleep 1
95$ssh_run service maas-regiond start95$ssh_run service maas-regiond start
96$ssh_run service apache2 restart96$ssh_run service apache2 restart