MAAS

Merge lp:~jtv/maas/bug-1049407 into lp:maas/trunk

  1. bug-1049407
  2. Merge into trunk
Proposed by Jeroen T. Vermeulen on 2012-09-12
Status: Merged
Approved by: Jeroen T. Vermeulen on 2012-09-12
Approved revision: 987
Merged at revision: 987
Proposed branch: lp:~jtv/maas/bug-1049407
Merge into: lp:maas/trunk
Diff against target: 29 lines (+4/-4)
2 files modified
contrib/maas_local_settings.py (+2/-2)
src/maas/settings.py (+2/-2)
To merge this branch: bzr merge lp:~jtv/maas/bug-1049407
Reviewer Review Type Date Requested Status
John A Meinel 2012-09-12 Approve on 2012-09-12
Review via email: mp+123891@code.launchpad.net

Commit Message

Document DEFAULT_MAAS_URL as facing the MAAS (rather than the user's browser).

The only place we found where we use DEFAULT_MAAS_URL as an “outward”-facing address is where the packaging tells the user where the UI is. After that, it's purely for helping the various systems in the MAAS find the central server. This led to a bug report that turned out to be due to the system not being configured properly. There were no changes to make, but I found some comments that could be clearer.

Description of the Change

Pre-imped with Julian.

Jeroen

To post a comment you must log in.
John A Meinel (jameinel) wrote :

This change is only comment fixes. Is there an actual code change?

John A Meinel (jameinel) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'contrib/maas_local_settings.py'
2--- contrib/maas_local_settings.py 2012-08-16 08:24:49 +0000
3+++ contrib/maas_local_settings.py 2012-09-12 07:05:20 +0000
4@@ -2,8 +2,8 @@
5 DEBUG = False
6
7 # Default URL specifying protocol, host, and (if necessary) port where
8-# this MAAS can be found. Configuration can, and probably should,
9-# override this.
10+# systems in this MAAS can find the MAAS server. Configuration can, and
11+# probably should, override this.
12 DEFAULT_MAAS_URL = "http://maas.internal.example.com/"
13
14 # Absolute path to the directory static files should be collected to.
15
16=== modified file 'src/maas/settings.py'
17--- src/maas/settings.py 2012-08-21 17:21:03 +0000
18+++ src/maas/settings.py 2012-09-12 07:05:20 +0000
19@@ -60,8 +60,8 @@
20 LONGPOLL_PATH = '/longpoll/'
21
22 # Default URL specifying protocol, host, and (if necessary) port where
23-# this MAAS can be found. Configuration can, and probably should,
24-# override this.
25+# systems in this MAAS can find the MAAS server. Configuration can, and
26+# probably should, override this.
27 DEFAULT_MAAS_URL = "http://%s/" % guess_server_address()
28
29 if FORCE_SCRIPT_NAME is not None: