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

[Jeroen T. Vermeulen]

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.

Pre-imped with Julian.

Jeroen

[John A Meinel (jameinel)]

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

[John A Meinel (jameinel)]

review: Approve

=== modified file 'contrib/maas_local_settings.py'
--- contrib/maas_local_settings.py	2012-08-16 08:24:49 +0000
+++ contrib/maas_local_settings.py	2012-09-12 07:05:20 +0000
@@ -2,8 +2,8 @@
 DEBUG = False
 
 # Default URL specifying protocol, host, and (if necessary) port where
-# this MAAS can be found.  Configuration can, and probably should,
-# override this.
+# systems in this MAAS can find the MAAS server.  Configuration can, and
+# probably should, override this.
 DEFAULT_MAAS_URL = "http://maas.internal.example.com/"
 
 # Absolute path to the directory static files should be collected to.

=== modified file 'src/maas/settings.py'
--- src/maas/settings.py	2012-08-21 17:21:03 +0000
+++ src/maas/settings.py	2012-09-12 07:05:20 +0000
@@ -60,8 +60,8 @@
 LONGPOLL_PATH = '/longpoll/'
 
 # Default URL specifying protocol, host, and (if necessary) port where
-# this MAAS can be found.  Configuration can, and probably should,
-# override this.
+# systems in this MAAS can find the MAAS server.  Configuration can, and
+# probably should, override this.
 DEFAULT_MAAS_URL = "http://%s/" % guess_server_address()
 
 if FORCE_SCRIPT_NAME is not None: