Merge lp:~julian-edwards/maas/remove-hardcoded-ip into lp:~maas-committers/maas/trunk

[Julian Edwards]

Use the domain and not hard-coded IP for default NTP server

[Julian Edwards (julian-edwards)]

review: Approve

=== modified file 'src/maasserver/forms_settings.py'
--- src/maasserver/forms_settings.py	2014-06-27 20:02:49 +0000
+++ src/maasserver/forms_settings.py	2014-07-03 07:02:22 +0000
@@ -173,7 +173,7 @@
             'required': False,
             'help_text': (
                 "NTP server address passed to nodes via a DHCP response. "
-                "e.g. for ntp.ubuntu.com: '91.189.94.4'")
+                "e.g. ntp.ubuntu.com")
         }
     },
     'default_osystem': {

=== modified file 'src/maasserver/models/config.py'
--- src/maasserver/models/config.py	2014-06-20 13:38:39 +0000
+++ src/maasserver/models/config.py	2014-07-03 07:02:22 +0000
@@ -53,7 +53,7 @@
         'default_distro_series': DEFAULT_OS.get_default_release(),
         'http_proxy': None,
         'upstream_dns': None,
-        'ntp_server': '91.189.94.4',  # ntp.ubuntu.com
+        'ntp_server': 'ntp.ubuntu.com',
         # RPC configuration.
         'rpc_region_certificate': None,
         # Third Party