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

[Jeroen T. Vermeulen]

Remove the cloud_images_archive setting, which has become unused. And, stop passing the archive settings to the import script: it only cares about Simplestreams sources now, not archive URLs.

In addition, this cleans up three settings that were completely unused: fallback_master_archive, keep_mirror_list_uptodate, and fetch_new_releases.

Also, the "OS release" setting belonged in the Ubuntu section of the config, not the Network section.

Jeroen

[Gavin Panella (allenap)]

review: Approve

=== modified file 'src/maasserver/forms.py'
--- src/maasserver/forms.py	2014-03-26 02:33:14 +0000
+++ src/maasserver/forms.py	2014-04-01 06:56:44 +0000
@@ -833,7 +833,6 @@
     default_distro_series = get_config_field('default_distro_series')
     main_archive = get_config_field('main_archive')
     ports_archive = get_config_field('ports_archive')
-    cloud_images_archive = get_config_field('cloud_images_archive')
 
 
 class GlobalKernelOptsForm(ConfigForm):

=== modified file 'src/maasserver/forms_settings.py'
--- src/maasserver/forms_settings.py	2014-03-17 15:15:53 +0000
+++ src/maasserver/forms_settings.py	2014-04-01 06:56:44 +0000
@@ -47,9 +47,6 @@
             'label': "Check component compatibility and certification"
         }
     },
-    #'fallback_master_archive': {},
-    #'keep_mirror_list_uptodate': {},
-    #'fetch_new_releases': {},
     'main_archive': {
         'default': 'http://archive.ubuntu.com/ubuntu',
         'form': forms.URLField,
@@ -57,8 +54,8 @@
             'label': "Main archive",
             'error_messages': {'invalid': INVALID_URL_MESSAGE},
             'help_text': (
-                "Archive used by nodes to retrieve packages and by cluster "
-                "controllers to retrieve boot images (Intel architectures). "
+                "Archive used by nodes to retrieve packages for Intel "
+                "architectures. "
                 "E.g. http://archive.ubuntu.com/ubuntu."
             )
         }
@@ -70,24 +67,12 @@
             'label': "Ports archive",
             'error_messages': {'invalid': INVALID_URL_MESSAGE},
             'help_text': (
-                "Archive used by cluster controllers to retrieve boot "
-                "images (non-Intel architectures). "
+                "Archive used by nodes to retrieve packages for non-Intel "
+                "architectures. "
                 "E.g. http://ports.ubuntu.com/ubuntu-ports."
             )
         }
     },
-    'cloud_images_archive': {
-        'default': 'https://maas.ubuntu.com/images',
-        'form': forms.URLField,
-        'form_kwargs': {
-            'label': "Cloud images archive",
-            'error_messages': {'invalid': INVALID_URL_MESSAGE},
-            'help_text': (
-                "Archive used by the nodes to retrieve ephemeral images. "
-                "E.g. https://maas.ubuntu.com/images."
-            )
-        }
-    },
     'maas_name': {
         'default': gethostname(),
         'form': forms.CharField,

=== modified file 'src/maasserver/models/config.py'
--- src/maasserver/models/config.py	2014-03-24 01:22:54 +0000
+++ src/maasserver/models/config.py	2014-04-01 06:56:44 +0000
@@ -38,17 +38,13 @@
         # Commissioning section configuration.
         'check_compatibility': False,
         # Ubuntu section configuration.
-        'fallback_master_archive': False,
-        'keep_mirror_list_uptodate': False,
-        'fetch_new_releases': False,
         'main_archive': 'http://archive.ubuntu.com/ubuntu',
         'ports_archive': 'http://ports.ubuntu.com/ubuntu-ports',
-        'cloud_images_archive': 'https://maas.ubuntu.com/images',
+        'commissioning_distro_series': DISTRO_SERIES.trusty,
         # Network section configuration.
         'maas_name': gethostname(),
         'enlistment_domain': b'local',
         'default_distro_series': DISTRO_SERIES.trusty,
-        'commissioning_distro_series': DISTRO_SERIES.trusty,
         'http_proxy': None,
         'upstream_dns': None,
         'ntp_server': '91.189.94.4',  # ntp.ubuntu.com

=== modified file 'src/maasserver/models/nodegroup.py'
--- src/maasserver/models/nodegroup.py	2014-03-29 15:40:53 +0000
+++ src/maasserver/models/nodegroup.py	2014-04-01 06:56:44 +0000
@@ -264,19 +264,13 @@
         """
         # Avoid circular imports.
         from maasserver.models import Config
-        config_parameters = {
-            'http_proxy',
-            'main_archive',
-            'ports_archive',
-            'cloud_images_archive',
-        }
         task_kwargs = {
-            name: Config.objects.get_config(name)
-            for name in config_parameters
-            if Config.objects.get_config(name) is not None
-        }
-        task_kwargs['callback'] = report_boot_images.subtask(
-            options={'queue': self.uuid})
+            'callback': report_boot_images.subtask(
+                options={'queue': self.uuid}),
+            }
+        http_proxy = Config.objects.get_config('http_proxy')
+        if http_proxy is not None:
+            task_kwargs['http_proxy'] = http_proxy
         import_boot_images.apply_async(queue=self.uuid, kwargs=task_kwargs)
 
     def add_seamicro15k(self, mac, username, password, power_control=None):

=== modified file 'src/maasserver/models/tests/test_nodegroup.py'
--- src/maasserver/models/tests/test_nodegroup.py	2014-03-26 14:37:21 +0000
+++ src/maasserver/models/tests/test_nodegroup.py	2014-04-01 06:56:44 +0000
@@ -252,14 +252,6 @@
             for args, kwargs in recorder.apply_async.call_args_list]
         self.assertItemsEqual(expected_queues, actual_queues)
 
-
-def make_archive_url(name):
-    """Create a fake archive URL."""
-    return "http://%s.example.com/%s/" % (
-        factory.make_name(name),
-        factory.make_name('path'),
-        )
-
     def test_refresh_workers_refreshes_accepted_cluster_controllers(self):
         self.patch(nodegroup_module, 'refresh_worker')
         nodegroup = factory.make_node_group(status=NODEGROUP_STATUS.ACCEPTED)
@@ -447,24 +439,6 @@
             (proxy, proxy),
             (env.get('http_proxy'), env.get('https_proxy')))
 
-    def test_import_boot_images_selects_archive_locations_from_config(self):
-        recorder = self.patch(nodegroup_module, 'import_boot_images')
-        nodegroup = factory.make_node_group(status=NODEGROUP_STATUS.ACCEPTED)
-
-        archives = {
-            'main_archive': make_archive_url('main'),
-            'ports_archive': make_archive_url('ports'),
-            'cloud_images_archive': make_archive_url('cloud_images'),
-        }
-        for key, value in archives.items():
-            Config.objects.set_config(key, value)
-
-        nodegroup.import_boot_images()
-
-        kwargs = recorder.apply_async.call_args[1]['kwargs']
-        archive_options = {arg: kwargs.get(arg) for arg in archives}
-        self.assertEqual(archives, archive_options)
-
     def test_import_boot_images_sent_to_nodegroup_queue(self):
         recorder = self.patch(nodegroup_module, 'import_boot_images')
         nodegroup = factory.make_node_group()

=== modified file 'src/maasserver/views/tests/test_settings.py'
--- src/maasserver/views/tests/test_settings.py	2014-02-25 15:53:10 +0000
+++ src/maasserver/views/tests/test_settings.py	2014-04-01 06:56:44 +0000
@@ -145,7 +145,6 @@
         self.client_log_in(as_admin=True)
         new_main_archive = 'http://test.example.com/archive'
         new_ports_archive = 'http://test2.example.com/archive'
-        new_cloud_images_archive = 'http://test3.example.com/archive'
         new_default_distro_series = factory.getRandomEnum(DISTRO_SERIES)
         response = self.client.post(
             reverse('settings'),
@@ -154,7 +153,6 @@
                 data={
                     'main_archive': new_main_archive,
                     'ports_archive': new_ports_archive,
-                    'cloud_images_archive': new_cloud_images_archive,
                     'default_distro_series': new_default_distro_series,
                 }))
 
@@ -163,13 +161,11 @@
             (
                 new_main_archive,
                 new_ports_archive,
-                new_cloud_images_archive,
                 new_default_distro_series,
             ),
             (
                 Config.objects.get_config('main_archive'),
                 Config.objects.get_config('ports_archive'),
-                Config.objects.get_config('cloud_images_archive'),
                 Config.objects.get_config('default_distro_series'),
             ))
 

=== modified file 'src/provisioningserver/tasks.py'
--- src/provisioningserver/tasks.py	2014-04-01 06:56:44 +0000
+++ src/provisioningserver/tasks.py	2014-04-01 06:56:44 +0000
@@ -446,8 +446,7 @@
 
 @task
 @log_exception_text
-def import_boot_images(http_proxy=None, main_archive=None, ports_archive=None,
-                       cloud_images_archive=None, callback=None):
+def import_boot_images(http_proxy=None, callback=None):
     env = dict(os.environ)
     if http_proxy is not None:
         env['http_proxy'] = http_proxy