Merge lp:~blake-rouse/maas/osystem-preseed-cleanup into lp:~maas-committers/maas/trunk

[Blake Rouse]

This is the final change in the series of changes to allow MAAS to deploy other operating systems. As we have Windows and CentOS support coming soon this is needed to easily add new operating systems.

Removed the DISTRO_SERIES enums as they are no longer needed, all information comes from the OperatingSystemRegistry.

Added the ability for an operating system to compose its own preseed. This will be used for Windows, CentOS and other operating systems.

[Jeroen T. Vermeulen (jtv)]

Thanks for doing this work. It's good to see those old hard-coded enums go at last. Unfortunately there's that pervasive problem of the registries living in a different process, possibly on a different machine. We should probably have been a lot clearer about that.

This branch answers a question I asked on one of your other merge proposals: does OperatingSystem really need to be a base class? If it's going to have a method for generating preseed data, and if it really can't be addressed with simple text templating, then it probably does.

An uncomfortable number of dimensional axes are coming together in compose_preseed: commissioning vs. deployment, operating systems with and without preseed code, conventional installer or fastpath (or whatever install options some other OS might have in their place). Gotta nip that sort of burgeoning complexity in the bud, or it will eventually stifle further development. Fight it with fire because by nature it will just keep growing.

So, assuming that we really do need OS-specific preseed-generating code, I would look for a way to move the Ubuntu-specific parts into the Ubuntu OperatingSystem. Or if most-but-not-all operating systems can generate their preseeds using templates, delegate most operating systems' implementations to a single template-based helper. (If templates can reasonably do the job for all operating systems we have in mind, of course, just use templating and stick with generic code.)

The hasattr check is best avoided, I think. If you're going to rely on dynamic dispatch for this, go all the way. You can accommodate some kind of sensible default in the dynamic method's definition, but an unconditional code path is going to be more manageable than special-casing in the code. Conditionals are our profession's equivalent of moving parts: they introduce complexity and risk.

There also seems to be a tacit rule in there that the commissioning OS must be, or work like, Ubuntu. That is worth being very explicit about. This isn't just a series of "if" statements to make things work, it's defining how a node can or cannot be installed. The details of of how these conditions interact are crucial, and yet I don't see any tests covering things like “we generate the customary Ubuntu preseed for a commissioning node, even if it's to be deployed with a different OS.”

By the way, I do appreciate how this branch is small and focused and not thrown in with a large bag of other changes!

review: Needs Fixing

[Blake Rouse (blake-rouse)]

Removed the hasattr check to use a NotImplemented exception. Can you give this another review?

[Jeroen T. Vermeulen (jtv)]

Thanks, this branch looks a lot simpler than I remember it! Could you add a note in the docstring for compose_preseed about the NotImplementedError and what it means? Similar to “:param …:” and “:return:” the format also supports “:raise …:”.

review: Approve

=== modified file 'src/maasserver/api.py'
--- src/maasserver/api.py	2014-05-29 18:21:27 +0000
+++ src/maasserver/api.py	2014-05-29 18:21:27 +0000
@@ -258,10 +258,6 @@
     OperatingSystemRegistry,
     )
 from provisioningserver.kernel_opts import KernelParameters
-from provisioningserver.driver import (
-    BOOT_IMAGE_PURPOSE,
-    OperatingSystemRegistry,
-    )
 from provisioningserver.power_schema import UNKNOWN_POWER_TYPE
 import simplejson as json
 
@@ -422,11 +418,7 @@
             operating system the node will use.
         :type osystem: unicode
         :param distro_series: If present, this parameter specifies the
-<<<<<<< TREE
             OS release the node will use.
-=======
-            os relase the node will use.
->>>>>>> MERGE-SOURCE
         :type distro_series: unicode
 
         Ideally we'd have MIME multipart and content-transfer-encoding etc.
@@ -453,7 +445,6 @@
             node = Node.objects.get_node_or_404(
                 system_id=system_id, user=request.user,
                 perm=NODE_PERMISSION.EDIT)
-<<<<<<< TREE
             Form = get_node_edit_form(request.user)
             form = Form(instance=node)
             form.set_distro_series(series=series)
@@ -461,9 +452,6 @@
                 form.save()
             else:
                 raise ValidationError(form.errors)
-=======
-            node.set_osystem_and_distro_series(osystem, series)
->>>>>>> MERGE-SOURCE
         nodes = Node.objects.start_nodes(
             [system_id], request.user, user_data=user_data)
         if len(nodes) == 0:
@@ -476,10 +464,6 @@
         """Release a node.  Opposite of `NodesHandler.acquire`."""
         node = Node.objects.get_node_or_404(
             system_id=system_id, user=request.user, perm=NODE_PERMISSION.EDIT)
-<<<<<<< TREE
-=======
-        node.set_osystem_and_distro_series(osystem='', series='')
->>>>>>> MERGE-SOURCE
         if node.status == NODE_STATUS.READY:
             # Nothing to do.  This may be a redundant retry, and the
             # postcondition is achieved, so call this success.
@@ -2429,7 +2413,6 @@
             if node.should_use_traditional_installer():
                 return "install"
             else:
-<<<<<<< TREE
                 # Return normal install if the booting operating system
                 # doesn't support xinstall.
                 osystem_obj = OperatingSystemRegistry[osystem]
@@ -2438,17 +2421,6 @@
                 if BOOT_IMAGE_PURPOSE.XINSTALL in purposes:
                     return "xinstall"
                 return "install"
-=======
-                # Check that the booting operating system, actually supports
-                # fast-path installation. If it does not then, we need to
-                # return normal install.
-                osystem_obj = OperatingSystemRegistry[osystem]
-                purposes = osystem_obj.get_boot_image_purposes(
-                    arch, subarch, series, label)
-                if BOOT_IMAGE_PURPOSE.XINSTALL in purposes:
-                    return "xinstall"
-                return "install"
->>>>>>> MERGE-SOURCE
         else:
             return "local"  # TODO: Investigate.
     else:
@@ -2555,18 +2527,10 @@
 
         subarch = get_optional_param(request.GET, 'subarch', 'generic')
 
-<<<<<<< TREE
     # Get the purpose, without a selected label
     purpose = get_boot_purpose(
         node, osystem, arch, subarch, series, label=None)
 
-=======
-    # Get the purpose, checking that if node is using xinstall, the operating
-    # system actaully supports that mode. We pass None for the label, here
-    # because it is unknown which label will be used yet.
-    purpose = get_boot_purpose(node, osystem, arch, subarch, series, None)
-
->>>>>>> MERGE-SOURCE
     # We use as our default label the label of the most recent image for
     # the criteria we've assembled above. If there is no latest image
     # (which should never happen in reality but may happen in tests), we
@@ -2590,16 +2554,9 @@
         subarch = latest_image.subarchitecture
     label = get_optional_param(request.GET, 'label', latest_label)
 
-<<<<<<< TREE
     # Get the supported purpose with the boot label
     purpose = get_boot_purpose(node, osystem, arch, subarch, series, label)
 
-=======
-    # Now that we have the correct label, lets check the boot purpose again
-    # to make sure that the boot image with that label, is the correct purpose.
-    purpose = get_boot_purpose(node, osystem, arch, subarch, series, label)
-
->>>>>>> MERGE-SOURCE
     if node is not None:
         # We don't care if the kernel opts is from the global setting or a tag,
         # just get the options
 
=== modified file 'src/maasserver/compose_preseed.py'
--- src/maasserver/compose_preseed.py	2013-10-18 09:54:17 +0000
+++ src/maasserver/compose_preseed.py	2014-05-29 18:21:27 +0000
@@ -20,6 +20,7 @@
 
 from maasserver.enum import NODE_STATUS
 from maasserver.utils import absolute_reverse
+from provisioningserver.driver import OperatingSystemRegistry
 import yaml
 
 
@@ -104,6 +105,13 @@
     if node.status == NODE_STATUS.COMMISSIONING:
         return compose_commissioning_preseed(token, base_url)
     else:
+        osystem = OperatingSystemRegistry[node.get_osystem()]
+        metadata_url = absolute_reverse('metadata', base_url=base_url)
+        try:
+            return osystem.compose_preseed(node, token, metadata_url)
+        except NotImplementedError:
+            pass
+
         if node.should_use_traditional_installer():
             return compose_cloud_init_preseed(token, base_url)
         else:
 
=== modified file 'src/maasserver/enum.py'
--- src/maasserver/enum.py	2014-03-28 16:36:32 +0000
+++ src/maasserver/enum.py	2014-05-29 18:21:27 +0000
@@ -13,7 +13,6 @@
 
 __metaclass__ = type
 __all__ = [
-    'COMMISSIONING_DISTRO_SERIES_CHOICES',
     'COMPONENT',
     'NODEGROUP_STATUS',
     'NODEGROUP_STATUS_CHOICES',
@@ -25,8 +24,6 @@
     'NODE_STATUS_CHOICES',
     'NODE_STATUS_CHOICES_DICT',
     'PRESEED_TYPE',
-    'DISTRO_SERIES',
-    'DISTRO_SERIES_CHOICES',
     'USERDATA_TYPE',
     ]
 
@@ -86,36 +83,6 @@
 NODE_STATUS_CHOICES_DICT = OrderedDict(NODE_STATUS_CHOICES)
 
 
-class DISTRO_SERIES:
-    """List of supported ubuntu releases."""
-    #:
-    default = ''
-    #:
-    precise = 'precise'
-    #:
-    quantal = 'quantal'
-    #:
-    raring = 'raring'
-    #:
-    saucy = 'saucy'
-    #:
-    trusty = 'trusty'
-
-DISTRO_SERIES_CHOICES = (
-    (DISTRO_SERIES.default, 'Default Ubuntu Release'),
-    (DISTRO_SERIES.precise, 'Ubuntu 12.04 LTS "Precise Pangolin"'),
-    (DISTRO_SERIES.quantal, 'Ubuntu 12.10 "Quantal Quetzal"'),
-    (DISTRO_SERIES.raring, 'Ubuntu 13.04 "Raring Ringtail"'),
-    (DISTRO_SERIES.saucy, 'Ubuntu 13.10 "Saucy Salamander"'),
-    (DISTRO_SERIES.trusty, 'Ubuntu 14.04 LTS "Trusty Tahr"'),
-)
-
-
-COMMISSIONING_DISTRO_SERIES_CHOICES = (
-    (DISTRO_SERIES.trusty, dict(DISTRO_SERIES_CHOICES)[DISTRO_SERIES.trusty]),
-)
-
-
 class NODE_PERMISSION:
     """Permissions relating to nodes."""
     VIEW = 'view_node'
 
=== modified file 'src/maasserver/forms.py'
--- src/maasserver/forms.py	2014-05-29 18:21:27 +0000
+++ src/maasserver/forms.py	2014-05-29 17:03:20 +0000
@@ -85,10 +85,6 @@
 from maasserver.forms_settings import (
     CONFIG_ITEMS_KEYS,
     get_config_field,
-<<<<<<< TREE
-=======
-    list_commisioning_choices,
->>>>>>> MERGE-SOURCE
     INVALID_SETTING_MSG_TEMPLATE,
     list_commisioning_choices,
     )
@@ -219,7 +215,6 @@
         return all_architectures[0]
 
 
-<<<<<<< TREE
 def list_all_usable_osystems():
     """Return all operating systems that can be used for nodes.
 
@@ -320,82 +315,6 @@
     return None
 
 
-=======
-def list_all_usable_osystems():
-    """Return all operating systems that can be used for nodes.
-
-    These are the operating systems for which any nodegroup has the boot images
-    required to boot the node.
-    """
-    # The Node edit form offers all usable operating systems as options for the
-    # osystem field.  Not all of these may be available in the node's
-    # nodegroup, but to represent that accurately in the UI would depend on
-    # the currently selected nodegroup.  Narrowing the options down further
-    # would have to happen browser-side.
-    osystems = set()
-    for nodegroup in NodeGroup.objects.all():
-        osystems = osystems.union(
-            BootImage.objects.get_usable_osystems(nodegroup))
-    osystems = [OperatingSystemRegistry[osystem] for osystem in osystems]
-    return sorted(osystems, key=lambda osystem: osystem.title)
-
-
-def list_osystem_choices(osystems):
-    """Return Django "choices" list for `osystem`."""
-    choices = [('', 'Default OS')]
-    choices += [
-        (osystem.name, osystem.title)
-        for osystem in osystems
-        ]
-    return choices
-
-
-def list_all_usable_releases(osystems):
-    """Return dictionary of usable `releases` for each opertaing system."""
-    distro_series = {}
-    nodegroups = list(NodeGroup.objects.all())
-    for osystem in osystems:
-        releases = set()
-        for nodegroup in nodegroups:
-            releases = releases.union(
-                BootImage.objects.get_usable_releases(nodegroup, osystem.name))
-        distro_series[osystem.name] = sorted(releases)
-    return distro_series
-
-
-def list_release_choices(releases):
-    """Return Django "choices" list for `releases`."""
-    choices = [('', 'Default OS Release')]
-    for key, value in releases.items():
-        osystem = OperatingSystemRegistry[key]
-        options = osystem.format_release_choices(value)
-        choices += [(
-            '%s/' % osystem.name,
-            'Latest %s Release' % osystem.title
-            )]
-        choices += [
-            ('%s/%s' % (osystem.name, name), title)
-            for name, title in options
-            ]
-    return choices
-
-
-def clean_distro_series_field(form, field, os_field):
-    # distro_series field can be supplied the value os/release, that is the
-    # way the web UI provides the value.
-    new_distro_series = form.cleaned_data.get(field)
-    if new_distro_series is not None and '/' in new_distro_series:
-        os, release = new_distro_series.split('/', 1)
-        if 'os' in form.cleaned_data:
-            new_os = form.cleaned_data[os_field]
-            if os != new_os:
-                raise ValidationError(
-                    "%s option does not match osystem option." % field)
-        return release
-    return new_distro_series
-
-
->>>>>>> MERGE-SOURCE
 class NodeForm(ModelForm):
 
     def __init__(self, request=None, *args, **kwargs):
@@ -428,7 +347,6 @@
             choices=choices, required=True, initial=default_arch,
             error_messages={'invalid_choice': invalid_arch_message})
 
-<<<<<<< TREE
     def set_up_osystem_and_distro_series_fields(self, instance):
         """Create the `osystem` and `distro_series` fields.
 
@@ -455,43 +373,6 @@
             if instance is not None:
                 self.initial['distro_series'] = initial_value
 
-=======
-    def set_up_osystem_and_distro_series_fields(self, instance):
-        """Create the `osystem` and `distro_series` fields.
-
-        This needs to be done on the fly so that we can pass a dynamic list of
-        usable operating systems and distro_series.
-        """
-        osystems = list_all_usable_osystems()
-        releases = list_all_usable_releases(osystems)
-        choices = list_osystem_choices(osystems)
-        distro_choices = list_release_choices(releases)
-        invalid_osystem_message = compose_invalid_choice_text(
-            'osystem', choices)
-        invalid_distro_series_message = compose_invalid_choice_text(
-            'distro_series', distro_choices)
-        self.fields['osystem'] = forms.ChoiceField(
-            label="OS", choices=choices, required=False, initial='',
-            error_messages={'invalid_choice': invalid_osystem_message})
-        self.fields['distro_series'] = forms.ChoiceField(
-            label="Release", choices=distro_choices,
-            required=False, initial='',
-            error_messages={'invalid_choice': invalid_distro_series_message})
-
-        # Set the initial for the distro_series so it is selected
-        # correctly in the gui.
-        if instance is not None:
-            osystem = instance.osystem
-            series = instance.distro_series
-            if osystem is not None and osystem != '':
-                if series is None:
-                    series = ''
-                self.initial['distro_series'] = '%s/%s' % (
-                    osystem,
-                    series,
-                    )
-
->>>>>>> MERGE-SOURCE
     def clean_hostname(self):
         # Don't allow the hostname to be changed if the node is
         # currently allocated.  Juju knows the node by its old name, so
@@ -516,7 +397,6 @@
             is_valid = False
         return is_valid
 
-<<<<<<< TREE
     def set_distro_series(self, series=''):
         """Sets the osystem and distro_series, from the provided
         distro_series.
@@ -536,8 +416,6 @@
             else:
                 self.data['distro_series'] = series
 
-=======
->>>>>>> MERGE-SOURCE
     hostname = forms.CharField(
         label="Host name", required=False, help_text=(
             "The FQDN (Fully Qualified Domain Name) is derived from the "
 
=== modified file 'src/maasserver/forms_settings.py'
--- src/maasserver/forms_settings.py	2014-05-29 18:21:27 +0000
+++ src/maasserver/forms_settings.py	2014-05-29 16:59:04 +0000
@@ -31,7 +31,6 @@
 INVALID_URL_MESSAGE = "Enter a valid url (e.g. http://host.example.com)."
 
 
-<<<<<<< TREE
 def list_osystem_choices():
     osystems = [osystem for _, osystem in OperatingSystemRegistry]
     osystems = sorted(osystems, key=lambda osystem: osystem.title)
@@ -59,33 +58,6 @@
     releases = DEFAULT_OS.get_supported_commissioning_releases()
     options = DEFAULT_OS.format_release_choices(releases)
     return list(options)
-=======
-def list_osystem_choices():
-    return [
-        (osystem.name, osystem.title)
-        for _, osystem in OperatingSystemRegistry
-        ]
-
-
-def list_release_choices():
-    osystems = [osystem for _, osystem in OperatingSystemRegistry]
-    choices = []
-    for osystem in osystems:
-        supported = sorted(osystem.get_supported_releases())
-        options = osystem.format_release_choices(supported)
-        options = [
-            ('%s/%s' % (osystem.name, name), title)
-            for name, title in options
-            ]
-        choices += options
-    return choices
-
-
-def list_commisioning_choices():
-    releases = DEFAULT_OS.get_supported_commissioning_releases()
-    options = DEFAULT_OS.format_release_choices(releases)
-    return [(name, title) for name, title in options]
->>>>>>> MERGE-SOURCE
 
 
 CONFIG_ITEMS = {
 
=== removed file 'src/maasserver/migrations/0077_add_osystem_to_node.py'
--- src/maasserver/migrations/0077_add_osystem_to_node.py	2014-05-29 18:21:27 +0000
+++ src/maasserver/migrations/0077_add_osystem_to_node.py	1970-01-01 00:00:00 +0000
@@ -1,264 +0,0 @@
-# -*- coding: utf-8 -*-
-from south.utils import datetime_utils as datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding field 'Node.osystem'
-        db.add_column(u'maasserver_node', 'osystem',
-                      self.gf('django.db.models.fields.CharField')(default=u'', max_length=20, null=True, blank=True),
-                      keep_default=False)
-
-
-    def backwards(self, orm):
-        # Deleting field 'Node.osystem'
-        db.delete_column(u'maasserver_node', 'osystem')
-
-
-    models = {
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        u'maasserver.bootimage': {
-            'Meta': {'unique_together': "((u'nodegroup', u'osystem', u'architecture', u'subarchitecture', u'release', u'purpose', u'label'),)", 'object_name': 'BootImage'},
-            'architecture': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'label': ('django.db.models.fields.CharField', [], {'default': "u'release'", 'max_length': '255'}),
-            'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}),
-            'osystem': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'purpose': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'release': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'subarchitecture': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {})
-        },
-        u'maasserver.bootsource': {
-            'Meta': {'object_name': 'BootSource'},
-            'cluster': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']", 'null': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'keyring_data': ('django.db.models.fields.BinaryField', [], {'blank': 'True'}),
-            'keyring_filename': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'url': ('django.db.models.fields.URLField', [], {'max_length': '200'})
-        },
-        u'maasserver.bootsourceselection': {
-            'Meta': {'object_name': 'BootSourceSelection'},
-            'arches': ('djorm_pgarray.fields.ArrayField', [], {'default': 'None', 'dbtype': "u'text'", 'null': 'True', 'blank': 'True'}),
-            'boot_source': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.BootSource']"}),
-            'created': ('django.db.models.fields.DateTimeField', [], {}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'labels': ('djorm_pgarray.fields.ArrayField', [], {'default': 'None', 'dbtype': "u'text'", 'null': 'True', 'blank': 'True'}),
-            'release': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '20', 'null': 'True', 'blank': 'True'}),
-            'subarches': ('djorm_pgarray.fields.ArrayField', [], {'default': 'None', 'dbtype': "u'text'", 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {})
-        },
-        u'maasserver.componenterror': {
-            'Meta': {'object_name': 'ComponentError'},
-            'component': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {}),
-            'error': ('django.db.models.fields.CharField', [], {'max_length': '1000'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {})
-        },
-        u'maasserver.config': {
-            'Meta': {'object_name': 'Config'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'value': ('maasserver.fields.JSONObjectField', [], {'null': 'True'})
-        },
-        u'maasserver.dhcplease': {
-            'Meta': {'object_name': 'DHCPLease'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'ip': ('django.db.models.fields.IPAddressField', [], {'unique': 'True', 'max_length': '15'}),
-            'mac': ('maasserver.fields.MACAddressField', [], {}),
-            'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"})
-        },
-        u'maasserver.downloadprogress': {
-            'Meta': {'object_name': 'DownloadProgress'},
-            'bytes_downloaded': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {}),
-            'error': ('django.db.models.fields.CharField', [], {'max_length': '1000', 'blank': 'True'}),
-            'filename': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}),
-            'size': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {})
-        },
-        u'maasserver.filestorage': {
-            'Meta': {'unique_together': "((u'filename', u'owner'),)", 'object_name': 'FileStorage'},
-            'content': ('metadataserver.fields.BinaryField', [], {'blank': 'True'}),
-            'filename': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'default': "u'9bbf01e4-cbbd-11e3-afb3-bcee7b78dc5b'", 'unique': 'True', 'max_length': '36'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
-        },
-        u'maasserver.macaddress': {
-            'Meta': {'object_name': 'MACAddress'},
-            'created': ('django.db.models.fields.DateTimeField', [], {}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mac_address': ('maasserver.fields.MACAddressField', [], {'unique': 'True'}),
-            'networks': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['maasserver.Network']", 'symmetrical': 'False', 'blank': 'True'}),
-            'node': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.Node']"}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {})
-        },
-        u'maasserver.network': {
-            'Meta': {'object_name': 'Network'},
-            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'ip': ('django.db.models.fields.GenericIPAddressField', [], {'unique': 'True', 'max_length': '39'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
-            'netmask': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'}),
-            'vlan_tag': ('django.db.models.fields.PositiveSmallIntegerField', [], {'unique': 'True', 'null': 'True', 'blank': 'True'})
-        },
-        u'maasserver.node': {
-            'Meta': {'object_name': 'Node'},
-            'agent_name': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'architecture': ('django.db.models.fields.CharField', [], {'max_length': '31'}),
-            'cpu_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {}),
-            'distro_series': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '20', 'null': 'True', 'blank': 'True'}),
-            'error': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
-            'hostname': ('django.db.models.fields.CharField', [], {'default': "u''", 'unique': 'True', 'max_length': '255', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'memory': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'netboot': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']", 'null': 'True'}),
-            'osystem': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '20', 'null': 'True', 'blank': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}),
-            'power_parameters': ('maasserver.fields.JSONObjectField', [], {'default': "u''", 'blank': 'True'}),
-            'power_type': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '10', 'blank': 'True'}),
-            'routers': ('djorm_pgarray.fields.ArrayField', [], {'default': 'None', 'dbtype': "u'macaddr'", 'null': 'True', 'blank': 'True'}),
-            'status': ('django.db.models.fields.IntegerField', [], {'default': '0', 'max_length': '10'}),
-            'storage': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'system_id': ('django.db.models.fields.CharField', [], {'default': "u'node-9bbde11a-cbbd-11e3-afb3-bcee7b78dc5b'", 'unique': 'True', 'max_length': '41'}),
-            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['maasserver.Tag']", 'symmetrical': 'False'}),
-            'token': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['piston.Token']", 'null': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'zone': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.Zone']", 'on_delete': 'models.SET_DEFAULT'})
-        },
-        u'maasserver.nodegroup': {
-            'Meta': {'object_name': 'NodeGroup'},
-            'api_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '18'}),
-            'api_token': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['piston.Token']", 'unique': 'True'}),
-            'cluster_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {}),
-            'dhcp_key': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'maas_url': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'blank': 'True'}),
-            'status': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36'})
-        },
-        u'maasserver.nodegroupinterface': {
-            'Meta': {'unique_together': "((u'nodegroup', u'interface'),)", 'object_name': 'NodeGroupInterface'},
-            'broadcast_ip': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {}),
-            'foreign_dhcp_ip': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'interface': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
-            'ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'}),
-            'ip_range_high': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
-            'ip_range_low': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
-            'management': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}),
-            'router_ip': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
-            'subnet_mask': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {})
-        },
-        u'maasserver.sshkey': {
-            'Meta': {'unique_together': "((u'user', u'key'),)", 'object_name': 'SSHKey'},
-            'created': ('django.db.models.fields.DateTimeField', [], {}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.TextField', [], {}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
-        },
-        u'maasserver.tag': {
-            'Meta': {'object_name': 'Tag'},
-            'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {}),
-            'definition': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'kernel_opts': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {})
-        },
-        u'maasserver.userprofile': {
-            'Meta': {'object_name': 'UserProfile'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['auth.User']", 'unique': 'True'})
-        },
-        u'maasserver.zone': {
-            'Meta': {'ordering': "[u'name']", 'object_name': 'Zone'},
-            'created': ('django.db.models.fields.DateTimeField', [], {}),
-            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {})
-        },
-        u'piston.consumer': {
-            'Meta': {'object_name': 'Consumer'},
-            'description': ('django.db.models.fields.TextField', [], {}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
-            'status': ('django.db.models.fields.CharField', [], {'default': "'pending'", 'max_length': '16'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'consumers'", 'null': 'True', 'to': u"orm['auth.User']"})
-        },
-        u'piston.token': {
-            'Meta': {'object_name': 'Token'},
-            'callback': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'callback_confirmed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['piston.Consumer']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}),
-            'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
-            'timestamp': ('django.db.models.fields.IntegerField', [], {'default': '1398350097L'}),
-            'token_type': ('django.db.models.fields.IntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'tokens'", 'null': 'True', 'to': u"orm['auth.User']"}),
-            'verifier': ('django.db.models.fields.CharField', [], {'max_length': '10'})
-        }
-    }
-
-    complete_apps = ['maasserver']
 \ No newline at end of file
 
=== modified file 'src/maasserver/models/bootsource.py'
--- src/maasserver/models/bootsource.py	2014-05-22 13:42:52 +0000
+++ src/maasserver/models/bootsource.py	2014-05-29 18:21:27 +0000
@@ -29,6 +29,14 @@
 from maasserver.fields import EditableBinaryField
 from maasserver.models.cleansave import CleanSave
 from maasserver.models.timestampedmodel import TimestampedModel
+from provisioningserver.driver.os_ubuntu import UbuntuOS
+
+
+def list_release_choices():
+    """Return Django "choices" list for Ubuntu releases."""
+    osystem = UbuntuOS()
+    releases = osystem.get_supported_releases()
+    return osystem.format_release_choices(releases)
 
 
 class BootSource(CleanSave, TimestampedModel):
 
=== modified file 'src/maasserver/models/bootsourceselection.py'
--- src/maasserver/models/bootsourceselection.py	2014-05-16 11:41:18 +0000
+++ src/maasserver/models/bootsourceselection.py	2014-05-29 18:21:27 +0000
@@ -24,12 +24,16 @@
     )
 import djorm_pgarray.fields
 from maasserver import DefaultMeta
-from maasserver.enum import (
-    DISTRO_SERIES,
-    DISTRO_SERIES_CHOICES,
-    )
 from maasserver.models.cleansave import CleanSave
 from maasserver.models.timestampedmodel import TimestampedModel
+from provisioningserver.driver.os_ubuntu import UbuntuOS
+
+
+def list_release_choices():
+    """Return Django "choices" list for Ubuntu releases."""
+    osystem = UbuntuOS()
+    releases = osystem.get_supported_releases()
+    return osystem.format_release_choices(releases)
 
 
 class BootSourceSelectionManager(Manager):
@@ -47,8 +51,8 @@
     boot_source = ForeignKey('maasserver.BootSource', blank=False)
 
     release = CharField(
-        max_length=20, choices=DISTRO_SERIES_CHOICES, blank=True,
-        default=DISTRO_SERIES.default,
+        max_length=20, choices=list_release_choices(), blank=True,
+        default='',
         help_text="The Ubuntu release for which to import resources.")
 
     arches = djorm_pgarray.fields.ArrayField(dbtype="text")
 
=== modified file 'src/maasserver/models/node.py'
--- src/maasserver/models/node.py	2014-05-29 18:21:27 +0000
+++ src/maasserver/models/node.py	2014-05-29 18:21:27 +0000
@@ -508,23 +508,11 @@
     owner = ForeignKey(
         User, default=None, blank=True, null=True, editable=False)
 
-<<<<<<< TREE
     osystem = CharField(
         max_length=20, blank=True, default='')
 
-=======
-    osystem = CharField(
-        max_length=20, null=True, blank=True, default='',
-        validators=[validate_osystem])
-
->>>>>>> MERGE-SOURCE
     distro_series = CharField(
-<<<<<<< TREE
         max_length=20, blank=True, default='')
-=======
-        max_length=20, null=True, blank=True, default='',
-        validators=[validate_distro_series])
->>>>>>> MERGE-SOURCE
 
     architecture = CharField(max_length=31, blank=False)
 
@@ -831,7 +819,6 @@
         """The name of the queue for tasks specific to this node."""
         return self.nodegroup.work_queue
 
-<<<<<<< TREE
     def get_osystem(self):
         """Return the operating system to install that node."""
         use_default_osystem = (self.osystem is None or self.osystem == '')
@@ -840,39 +827,15 @@
         else:
             return self.osystem
 
-=======
-    def get_osystem(self):
-        """Return the operating system to install that node."""
-        use_default_osystem = (
-            not self.osystem or
-            self.osystem == '')
-        if use_default_osystem:
-            return Config.objects.get_config('default_osystem')
-        else:
-            return self.osystem
-
->>>>>>> MERGE-SOURCE
     def get_distro_series(self):
         """Return the distro series to install that node."""
-<<<<<<< TREE
         use_default_osystem = (
             self.osystem is None or
             self.osystem == '')
-=======
-        use_default_osystem = (
-            not self.osystem or
-            self.osystem == '')
->>>>>>> MERGE-SOURCE
         use_default_distro_series = (
-<<<<<<< TREE
             self.distro_series is None or
             self.distro_series == '')
         if use_default_osystem and use_default_distro_series:
-=======
-            not self.distro_series or
-            self.distro_series == '')
-        if use_default_osystem and use_default_distro_series:
->>>>>>> MERGE-SOURCE
             return Config.objects.get_config('default_distro_series')
         elif use_default_distro_series:
             osystem = OperatingSystemRegistry[self.osystem]
@@ -880,25 +843,6 @@
         else:
             return self.distro_series
 
-<<<<<<< TREE
-=======
-    def set_osystem(self, osystem=''):
-        """Set the operating system to install that node."""
-        self.osystem = osystem
-        self.save()
-
-    def set_distro_series(self, series=''):
-        """Set the distro series to install that node."""
-        self.distro_series = series
-        self.save()
-
-    def set_osystem_and_distro_series(self, osystem='', series=''):
-        """Set the oeprating system to install that node."""
-        self.osystem = osystem
-        self.distro_series = series
-        self.save()
-
->>>>>>> MERGE-SOURCE
     def get_effective_power_parameters(self):
         """Return effective power parameters, including any defaults."""
         if self.power_parameters:
 
=== modified file 'src/maasserver/models/tests/test_node.py'
--- src/maasserver/models/tests/test_node.py	2014-05-29 18:21:27 +0000
+++ src/maasserver/models/tests/test_node.py	2014-05-29 17:03:20 +0000
@@ -269,7 +269,6 @@
             offset += timedelta(1)
         self.assertEqual(macs[0], node.get_primary_mac().mac_address)
 
-<<<<<<< TREE
     def test_get_osystem_returns_default_osystem(self):
         node = factory.make_node(osystem='')
         osystem = Config.objects.get_config('default_osystem')
@@ -278,41 +277,6 @@
     def test_get_distro_series_returns_default_series(self):
         node = factory.make_node(distro_series='')
         series = Config.objects.get_config('default_distro_series')
-=======
-    def test_get_osystem_returns_default_osystem_and_series(self):
-        node = factory.make_node()
-        osystem = Config.objects.get_config('default_osystem')
-        series = Config.objects.get_config('default_distro_series')
-        self.assertEqual(osystem, node.get_osystem())
-        self.assertEqual(series, node.get_distro_series())
-
-    def test_get_series_returns_default_for_osystem(self):
-        node = factory.make_node()
-        osystem = factory.getRandomOS()
-        series = osystem.get_default_release()
-        node.set_osystem(osystem.name)
-        self.assertEqual(series, node.get_distro_series())
-
-    def test_set_get_osystem_returns_osystem(self):
-        osystem = factory.getRandomOS()
-        node = factory.make_node()
-        node.set_osystem(osystem.name)
-        self.assertEqual(osystem.name, node.get_osystem())
-
-    def test_set_get_distro_series_returns_series(self):
-        osystem = factory.getRandomOS()
-        series = factory.getRandomRelease(osystem)
-        node = factory.make_node()
-        node.set_distro_series(series)
->>>>>>> MERGE-SOURCE
-        self.assertEqual(series, node.get_distro_series())
-
-    def test_set_get_osystem_and_distro_series_returns_valid(self):
-        osystem = factory.getRandomOS()
-        series = factory.getRandomRelease(osystem)
-        node = factory.make_node()
-        node.set_osystem_and_distro_series(osystem.name, series)
-        self.assertEqual(osystem.name, node.get_osystem())
         self.assertEqual(series, node.get_distro_series())
 
     def test_delete_node_deletes_related_mac(self):
 
=== modified file 'src/maasserver/static/js/node_add.js'
--- src/maasserver/static/js/node_add.js	2014-05-29 18:21:27 +0000
+++ src/maasserver/static/js/node_add.js	2014-05-16 15:22:54 +0000
@@ -234,7 +234,6 @@
     },
 
     /**
-<<<<<<< TREE
      * If the 'distro_series' field is present, link it to operating
      * system field.
      *
@@ -251,24 +250,6 @@
     },
 
     /**
-=======
-     * If the 'distro_series' field is present, setup the linked
-     * 'distro_series' field.
-     *
-     * @method setUpDistroSeriesField
-     */
-    setUpDistroSeriesField: function() {
-        if (Y.Lang.isValue(Y.one('#id_distro_series'))) {
-            var widget = new Y.maas.os_distro_select.OSReleaseWidget({
-                srcNode: '#id_distro_series'
-                });
-            widget.bindTo(Y.one('#id_osystem'), 'change');
-            widget.render();
-        }
-    },
-
-    /**
->>>>>>> MERGE-SOURCE
      * If the 'power_type' field is present, setup the linked
      * 'power_parameter' field.
      *
 
=== renamed file 'src/maasserver/static/js/os_distro_select.js.moved' => 'src/maasserver/static/js/os_distro_select.js'
=== removed file 'src/maasserver/static/js/os_distro_select.js'
--- src/maasserver/static/js/os_distro_select.js	2014-05-29 18:21:27 +0000
+++ src/maasserver/static/js/os_distro_select.js	1970-01-01 00:00:00 +0000
@@ -1,131 +0,0 @@
-/* Copyright 2012-2014 Canonical Ltd.  This software is licensed under the
- * GNU Affero General Public License version 3 (see the file LICENSE).
- *
- * OS/Release seletion utilities.
- *
- * @module Y.maas.power_parameter
- */
-
-YUI.add('maas.os_distro_select', function(Y) {
-
-Y.log('loading maas.os_distro_select');
-var module = Y.namespace('maas.os_distro_select');
-
-// Only used to mockup io in tests.
-module._io = new Y.IO();
-
-var OSReleaseWidget;
-
-/**
- * A widget class used to have the content of a node's release <select>
- * modified based on the selected operating system.
- *
- */
-OSReleaseWidget = function() {
-    OSReleaseWidget.superclass.constructor.apply(this, arguments);
-};
-
-OSReleaseWidget.NAME = 'os-release-widget';
-
-Y.extend(OSReleaseWidget, Y.Widget, {
-
-   /**
-    * Initialize the widget.
-    * - cfg.srcNode is the node which will be updated when the selected
-    *   value of the 'os node' will change.
-    * - cfg.osNode is the node containing a 'select' element.  When
-    *   the selected element will change, the srcNode HTML will be
-    *   updated.
-    *
-    * @method initializer
-    */
-    initializer: function(cfg) {
-        this.initialSkip = true;
-    },
-
-   /**
-    * Bind the widget to events (to name 'event_name') generated by the given
-    * 'osNode'.
-    *
-    * @method bindTo
-    */
-    bindTo: function(osNode, event_name) {
-        var self = this;
-        Y.one(osNode).on(event_name, function(e) {
-            var osValue = e.currentTarget.get('value');
-            self.switchTo(osValue);
-        });
-        var osValue = Y.one(osNode).get('value');
-        self.switchTo(osValue);
-    },
-
-   /**
-    * React to a new value of the os node: update the HTML of
-    * 'srcNode'.
-    *
-    * @method switchTo
-    */
-    switchTo: function(newOSValue) {
-        var srcNode = this.get('srcNode');
-        var options = srcNode.all('option');
-        var selected = false;
-        options.each(function(option) {
-            var value = option.get('value');
-            var split_value = value.split("/");
-
-            // Only show the default option, if that
-            // is the selected os option as well.
-            if(newOSValue == '') {
-                if(value == '') {
-                    option.removeClass('hidden');
-                    option.set('selected', 'selected');
-                }
-                else {
-                    option.addClass('hidden');
-                }
-            }
-            else {
-                if(split_value[0] == newOSValue) {
-                    option.removeClass('hidden');
-                    if(split_value[1] == '') {
-                        selected = true;
-                        option.set('selected', 'selected');
-                    }
-                }
-                else {
-                    option.addClass('hidden');
-                }
-            }
-        });
-
-        // See if this was the inital skip. As the following
-        // should only be done, after the first load, as the
-        // initial will already be selected correctly.
-        if(this.initialSkip == true) {
-            this.initialSkip = false;
-            return;
-        }
-
-        // See if a selection was made, if not then we need
-        // to select the first visible as a default is not
-        // present.
-        if(!selected) {
-            var first_option = null;
-            options.each(function(option) {
-                if(!option.hasClass('hidden')) {
-                    if(first_option == null) {
-                        first_option = option;
-                    }   
-                }
-            });
-            if(first_option != null) {
-                first_option.set('selected', 'selected');
-            }
-        }
-    }
-});
-
-module.OSReleaseWidget = OSReleaseWidget;
-
-}, '0.1', {'requires': ['widget', 'io']}
-);
 
=== renamed file 'src/maasserver/static/js/tests/test_os_distro_select.html.moved' => 'src/maasserver/static/js/tests/test_os_distro_select.html'
=== removed file 'src/maasserver/static/js/tests/test_os_distro_select.html'
--- src/maasserver/static/js/tests/test_os_distro_select.html	2014-05-29 18:21:27 +0000
+++ src/maasserver/static/js/tests/test_os_distro_select.html	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <title>Test maas.os_distro_select</title>
-
-    <!-- YUI and test setup -->
-    <script type="text/javascript" src="../testing/yui_test_conf.js"></script>
-    <script type="text/javascript" src="/usr/share/javascript/yui3/yui/yui.js"></script>
-    <script type="text/javascript" src="../testing/testrunner.js"></script>
-    <script type="text/javascript" src="../testing/testing.js"></script>
-    <!-- The module under test -->
-    <script type="text/javascript" src="../os_distro_select.js"></script>
-    <!-- The test suite -->
-    <script type="text/javascript" src="test_os_distro_select.js"></script>
-  </head>
-  <body>
-  <span id="suite">maas.os_distro_select.tests</span>
-  <script type="text/x-template" id="select_node">
-    <select id="id_osystem">
-      <option value="" selected="selected">Default OS</option>
-      <option value="value1">Value1</option>
-      <option value="value2">Value2</option>
-    </select>
-  </script>
-  <script type="text/x-template" id="target_node">
-    <select id="id_distro_series">
-      <option value="" selected="selected">Default Release</option>
-      <option value="value1/series1">Value1Series1</option>
-      <option value="value1/series2">Value1Series2</option>
-      <option value="value1/series3">Value1Series3</option>
-      <option value="value2/series1">Value2Series1</option>
-      <option value="value2/series2">Value2Series2</option>
-      <option value="value2/series3">Value2Series3</option>
-    </select>
-  </script>
-  <div id="placeholder"></div>
-  </body>
-</html>
 
=== renamed file 'src/maasserver/static/js/tests/test_os_distro_select.js.moved' => 'src/maasserver/static/js/tests/test_os_distro_select.js'
=== removed file 'src/maasserver/static/js/tests/test_os_distro_select.js'
--- src/maasserver/static/js/tests/test_os_distro_select.js	2014-05-29 18:21:27 +0000
+++ src/maasserver/static/js/tests/test_os_distro_select.js	1970-01-01 00:00:00 +0000
@@ -1,106 +0,0 @@
-/* Copyright 2012 Canonical Ltd.  This software is licensed under the
- * GNU Affero General Public License version 3 (see the file LICENSE).
- */
-
-YUI({ useBrowserConsole: true }).add(
-    'maas.os_distro_select.tests', function(Y) {
-
-Y.log('loading maas.os_distro_select.tests');
-var namespace = Y.namespace('maas.os_distro_select.tests');
-
-var module = Y.maas.os_distro_select;
-var suite = new Y.Test.Suite("maas.os_distro_select Tests");
-
-var select_node_template = Y.one('#select_node').getContent();
-var target_node_template = Y.one('#target_node').getContent();
-
-suite.add(new Y.maas.testing.TestCase({
-    name: 'test-os_distro_select',
-
-    setUp: function () {
-        Y.one('#placeholder').empty().append(
-            Y.Node.create(select_node_template).append(
-                Y.Node.create(target_node_template)));
-    },
-
-    testBindToDefaultShowsDefaultRelease: function() {
-        var widget = new Y.maas.os_distro_select.OSReleaseWidget({
-            srcNode: '#id_distro_series',
-            });
-        widget.bindTo(Y.one('#id_osystem'), 'change');
-
-        var options = Y.one('#id_distro_series').all('option');
-        options.each(function(option) {
-            var value = option.get('value');
-            if(value == '') {
-                Y.Assert.isFalse(option.hasClass('hidden'));
-            }
-            else {
-                Y.Assert.isTrue(option.hasClass('hidden'));
-            }
-        });
-    },
-
-    testNonDefaultShowsRelatedReleases: function() {
-        var node = Y.one('#id_distro_series');
-        node.append('<option value="value1/">Value1Default</option>');
-
-        var widget = new Y.maas.os_distro_select.OSReleaseWidget({
-            srcNode: '#id_distro_series',
-            });
-        widget.bindTo(Y.one('#id_osystem'), 'change');
-
-        var newValue = 'value1';
-        var select = Y.one('#id_osystem');
-        select.set('value', newValue);
-        select.simulate('change');
-
-        var options = Y.one('#id_distro_series').all('option');
-        options.each(function(option) {
-            var value = option.get('value');
-            if(value == '') {
-                Y.Assert.isTrue(option.hasClass('hidden'));
-            }
-            else {
-                var split_value = value.split('/');
-                if(split_value[0] == newValue) {
-                    Y.Assert.isFalse(option.hasClass('hidden'));
-                }
-                else {
-                    Y.Assert.isTrue(option.hasClass('hidden'));
-                }
-            }
-        });
-
-        Y.Assert.areEqual(
-            newValue + '/', Y.one('#id_distro_series').get('value'))
-    },
-
-    testInitialSkipOnFirstChange: function() {
-        var newValue = 'value1/series1';
-        var select = Y.one('#id_osystem');
-        select.set('value', 'value1');
-        select.simulate('change');
-        select = Y.one('#id_distro_series');
-        select.set('value', newValue);
-        select.simulate('change');
-
-        var widget = new Y.maas.os_distro_select.OSReleaseWidget({
-            srcNode: '#id_distro_series',
-            });
-
-        Y.Assert.isTrue(widget.initialSkip);
-        widget.bindTo(Y.one('#id_osystem'), 'change');
-        Y.Assert.isFalse(widget.initialSkip);
-
-        Y.Assert.areEqual(
-            newValue, Y.one('#id_distro_series').get('value'))
-    }
-
-}));
-
-namespace.suite = suite;
-
-}, '0.1', {'requires': [
-    'node-event-simulate', 'test', 'maas.testing', 'maas.os_distro_select']}
-);
 
=== modified file 'src/maasserver/testing/factory.py'
--- src/maasserver/testing/factory.py	2014-05-29 17:03:20 +0000
+++ src/maasserver/testing/factory.py	2014-05-29 18:21:27 +0000
@@ -23,7 +23,6 @@
 from django.contrib.auth.models import User
 from maasserver.clusterrpc.power_parameters import get_power_types
 from maasserver.enum import (
-    DISTRO_SERIES_CHOICES,
     NODE_STATUS,
     NODEGROUP_STATUS,
     NODEGROUPINTERFACE_MANAGEMENT,
@@ -62,6 +61,7 @@
 # XXX 2014-05-13 blake-rouse bug=1319143
 # Need to not import directly, use RPC to info from cluster.
 from provisioningserver.driver import OperatingSystemRegistry
+from provisioningserver.driver.os_ubuntu import UbuntuOS
 
 # We have a limited number of public keys:
 # src/maasserver/tests/data/test_rsa{0, 1, 2, 3, 4}.pub
@@ -717,7 +717,8 @@
         if boot_source is None:
             boot_source = self.make_boot_source()
         if release is None:
-            release = self.getRandomChoice(DISTRO_SERIES_CHOICES)
+            ubuntu_os = UbuntuOS()
+            release = self.getRandomRelease(ubuntu_os)
         if arches is None:
             arch_count = random.randint(1, 10)
             arches = [self.make_name("arch") for i in range(arch_count)]
 
=== modified file 'src/maasserver/tests/test_api_boot_source_selections.py'
--- src/maasserver/tests/test_api_boot_source_selections.py	2014-05-27 13:53:21 +0000
+++ src/maasserver/tests/test_api_boot_source_selections.py	2014-05-29 18:21:27 +0000
@@ -19,11 +19,11 @@
 
 from django.core.urlresolvers import reverse
 from maasserver.api import DISPLAYED_BOOTSOURCESELECTION_FIELDS
-from maasserver.enum import DISTRO_SERIES_CHOICES
 from maasserver.models import BootSourceSelection
 from maasserver.testing import reload_object
 from maasserver.testing.api import APITestCase
 from maasserver.testing.factory import factory
+from provisioningserver.driver.os_ubuntu import UbuntuOS
 from testtools.matchers import MatchesStructure
 
 
@@ -98,8 +98,8 @@
     def test_PUT_updates_boot_source_selection(self):
         self.become_admin()
         boot_source_selection = factory.make_boot_source_selection()
-        new_release = factory.getRandomChoice(
-            DISTRO_SERIES_CHOICES)
+        ubuntu_os = UbuntuOS()
+        new_release = factory.getRandomRelease(ubuntu_os)
         new_values = {
             'release': new_release,
             'arches': [factory.make_name('arch'), factory.make_name('arch')],
@@ -160,8 +160,8 @@
     def test_POST_creates_boot_source_selection(self):
         self.become_admin()
         boot_source = factory.make_boot_source()
-        new_release = factory.getRandomChoice(
-            DISTRO_SERIES_CHOICES)
+        ubuntu_os = UbuntuOS()
+        new_release = factory.getRandomRelease(ubuntu_os)
         params = {
             'release': new_release,
             'arches': [factory.make_name('arch'), factory.make_name('arch')],
@@ -182,8 +182,8 @@
 
     def test_POST_requires_admin(self):
         boot_source = factory.make_boot_source()
-        new_release = factory.getRandomChoice(
-            DISTRO_SERIES_CHOICES)
+        ubuntu_os = UbuntuOS()
+        new_release = factory.getRandomRelease(ubuntu_os)
         params = {
             'release': new_release,
             'arches': [factory.make_name('arch'), factory.make_name('arch')],
 
=== modified file 'src/maasserver/tests/test_api_node.py'
--- src/maasserver/tests/test_api_node.py	2014-05-29 18:21:27 +0000
+++ src/maasserver/tests/test_api_node.py	2014-05-28 19:06:28 +0000
@@ -48,7 +48,6 @@
     NodeUserData,
     )
 from metadataserver.nodeinituser import get_node_init_user
-from provisioningserver.driver.os_ubuntu import UbuntuOS
 
 
 class NodeAnonAPITest(MAASServerTestCase):
@@ -222,7 +221,6 @@
         self.assertEqual(
             node.system_id, json.loads(response.content)['system_id'])
 
-<<<<<<< TREE
     def test_POST_start_sets_osystem_and_distro_series(self):
         node = factory.make_node(
             owner=self.logged_in_user, mac=True,
@@ -230,91 +228,18 @@
             architecture=make_usable_architecture(self))
         osystem = make_usable_osystem(self)
         distro_series = factory.getRandomRelease(osystem)
-=======
-    def test_POST_start_sets_osystem(self):
-        node = factory.make_node(
-            owner=self.logged_in_user, mac=True,
-            power_type='ether_wake')
-        osystem = factory.getRandomOS()
-        response = self.client.post(
-            self.get_node_uri(node),
-            {'op': 'start', 'osystem': osystem.name})
-        self.assertEqual(
-            (httplib.OK, node.system_id),
-            (response.status_code, json.loads(response.content)['system_id']))
-        self.assertEqual(
-            osystem.name, reload_object(node).osystem)
-
-    def test_POST_start_accepts_os(self):
-        node = factory.make_node(
-            owner=self.logged_in_user, mac=True,
-            power_type='ether_wake')
-        osystem = factory.getRandomOS()
-        response = self.client.post(
-            self.get_node_uri(node),
-            {'op': 'start', 'os': osystem.name})
-        self.assertEqual(
-            (httplib.OK, node.system_id),
-            (response.status_code, json.loads(response.content)['system_id']))
-        self.assertEqual(
-            osystem.name, reload_object(node).osystem)
-
-    def test_POST_start_sets_osystem_and_distro_series(self):
-        node = factory.make_node(
-            owner=self.logged_in_user, mac=True,
-            power_type='ether_wake')
-        osystem = factory.getRandomOS()
-        distro_series = factory.getRandomRelease(osystem)
-        response = self.client.post(
-            self.get_node_uri(node), {
-                'op': 'start',
-                'osystem': osystem.name,
-                'distro_series': distro_series
-                })
-        self.assertEqual(
-            (httplib.OK, node.system_id),
-            (response.status_code, json.loads(response.content)['system_id']))
-        self.assertEqual(
-            osystem.name, reload_object(node).osystem)
-        self.assertEqual(
-            distro_series, reload_object(node).distro_series)
-
-    def test_POST_start_sets_distro_series_defaults_ubuntu(self):
-        node = factory.make_node(
-            owner=self.logged_in_user, mac=True,
-            power_type='ether_wake')
-        osystem = UbuntuOS()
-        distro_series = factory.getRandomRelease(osystem)
->>>>>>> MERGE-SOURCE
-        response = self.client.post(
-            self.get_node_uri(node), {
-                'op': 'start',
-                'distro_series': distro_series
-                })
-        self.assertEqual(
-            (httplib.OK, node.system_id),
-            (response.status_code, json.loads(response.content)['system_id']))
-        self.assertEqual(
-            osystem.name, reload_object(node).osystem)
-        self.assertEqual(
-            distro_series, reload_object(node).distro_series)
-
-    def test_POST_start_validates_osystem(self):
-        node = factory.make_node(
-            owner=self.logged_in_user, mac=True,
-            power_type='ether_wake')
-        invalid_osystem = factory.getRandomString()
-        response = self.client.post(
-            self.get_node_uri(node),
-            {'op': 'start', 'osystem': invalid_osystem})
-        self.assertEqual(
-            (
-                httplib.BAD_REQUEST,
-                {'osystem': [
-                    "Value u'%s' is not a valid choice." %
-                    invalid_osystem]}
-            ),
-            (response.status_code, json.loads(response.content)))
+        response = self.client.post(
+            self.get_node_uri(node), {
+                'op': 'start',
+                'distro_series': distro_series
+                })
+        self.assertEqual(
+            (httplib.OK, node.system_id),
+            (response.status_code, json.loads(response.content)['system_id']))
+        self.assertEqual(
+            osystem.name, reload_object(node).osystem)
+        self.assertEqual(
+            distro_series, reload_object(node).distro_series)
 
     def test_POST_start_validates_distro_series(self):
         node = factory.make_node(
 
=== modified file 'src/maasserver/tests/test_api_pxeconfig.py'
--- src/maasserver/tests/test_api_pxeconfig.py	2014-05-29 18:21:27 +0000
+++ src/maasserver/tests/test_api_pxeconfig.py	2014-05-29 17:03:20 +0000
@@ -310,7 +310,6 @@
                 node.use_fastpath_installer()
             for name, value in parameters.items():
                 setattr(node, name, value)
-<<<<<<< TREE
             osystem = node.get_osystem()
             series = node.get_distro_series()
             arch, subarch = node.architecture.split('/')
@@ -334,15 +333,6 @@
             'install',
             api.get_boot_purpose(
                 node, node_os, arch, subarch, node_series, None))
-=======
-            osystem = node.get_osystem()
-            series = node.get_distro_series()
-            arch, subarch = node.architecture.split('/')
-            self.assertEqual(
-                purpose,
-                api.get_boot_purpose(
-                    node, osystem, arch, subarch, series, None))
->>>>>>> MERGE-SOURCE
 
     def test_pxeconfig_uses_boot_purpose(self):
         fake_boot_purpose = factory.make_name("purpose")
 
=== modified file 'src/maasserver/tests/test_compose_preseed.py'
--- src/maasserver/tests/test_compose_preseed.py	2013-10-07 09:12:40 +0000
+++ src/maasserver/tests/test_compose_preseed.py	2014-05-29 18:21:27 +0000
@@ -17,8 +17,10 @@
 from maasserver.compose_preseed import compose_preseed
 from maasserver.enum import NODE_STATUS
 from maasserver.testing.factory import factory
+from maasserver.testing.osystems import make_usable_osystem
 from maasserver.testing.testcase import MAASServerTestCase
 from maasserver.utils import absolute_reverse
+from maastesting.matchers import MockCalledOnceWith
 from metadataserver.models import NodeKey
 from testtools.matchers import (
     KeysEqual,
@@ -110,3 +112,16 @@
         self.assertEqual(
             absolute_reverse('curtin-metadata'),
             preseed['datasource']['MAAS']['metadata_url'])
+
+    def test_compose_preseed_with_osystem_compose_preseed(self):
+        osystem = make_usable_osystem(self)
+        mock_compose = self.patch(osystem, 'compose_preseed')
+        node = factory.make_node(
+            osystem=osystem.name, status=NODE_STATUS.READY)
+
+        token = NodeKey.objects.get_token_for_node(node)
+        url = absolute_reverse('metadata')
+        compose_preseed(node)
+        self.assertThat(
+            mock_compose,
+            MockCalledOnceWith(node, token, url))
 
=== modified file 'src/maasserver/tests/test_forms.py'
--- src/maasserver/tests/test_forms.py	2014-05-29 18:21:27 +0000
+++ src/maasserver/tests/test_forms.py	2014-05-29 18:21:27 +0000
@@ -29,7 +29,6 @@
 from django.http import QueryDict
 from maasserver.clusterrpc.power_parameters import get_power_type_choices
 from maasserver.enum import (
-    DISTRO_SERIES_CHOICES,
     NODE_STATUS,
     NODEGROUP_STATUS,
     NODEGROUPINTERFACE_MANAGEMENT,
@@ -99,11 +98,6 @@
     make_usable_architecture,
     patch_usable_architectures,
     )
-from maasserver.testing.osystems import (
-    make_osystem_with_releases,
-    make_usable_osystem,
-    patch_usable_osystems,
-    )
 from maasserver.testing.factory import factory
 from maasserver.testing.osystems import (
     make_osystem_with_releases,
@@ -117,6 +111,7 @@
 from metadataserver.models import CommissioningScript
 from netaddr import IPNetwork
 from provisioningserver import tasks
+from provisioningserver.driver.os_ubuntu import UbuntuOS
 from testtools import TestCase
 from testtools.matchers import (
     AllMatch,
@@ -153,14 +148,9 @@
             release = factory.make_name('release')
         for purpose in ['install', 'commissioning']:
             factory.make_boot_image(
-<<<<<<< TREE
                 nodegroup=nodegroup, osystem=osystem, architecture=arch,
                 subarchitecture=subarchitecture, release=release,
                 purpose=purpose)
-=======
-                nodegroup=nodegroup, osystem=osystem, architecture=arch,
-                subarchitecture=subarchitecture, release=release, purpose=purpose)
->>>>>>> MERGE-SOURCE
 
     def test_initialize_node_group_leaves_nodegroup_reference_intact(self):
         preselected_nodegroup = factory.make_node_group()
@@ -223,131 +213,67 @@
         arches = [factory.make_name('arch') for _ in range(5)]
         self.assertEqual(arches[0], pick_default_architecture(arches))
 
-<<<<<<< TREE
-    def test_list_all_usable_osystems_combines_nodegroups(self):
-        osystem_names = [factory.make_name('os') for _ in range(3)]
-        expected = []
-        for name in osystem_names:
-            self.make_usable_boot_images(osystem=name)
-            expected.append(make_usable_osystem(self, name))
-        self.assertItemsEqual(expected, list_all_usable_osystems())
-
-    def test_list_all_usable_osystems_sorts_output(self):
-        osystem_names = [factory.make_name('os') for _ in range(3)]
-        expected = []
-        for name in osystem_names:
-            self.make_usable_boot_images(osystem=name)
-            expected.append(make_usable_osystem(self, name))
-        expected = sorted(expected, key=lambda osystem: osystem.title)
-        self.assertEqual(expected, list_all_usable_osystems())
-
-    def test_list_all_usable_osystems_returns_no_duplicates(self):
-        os_name = factory.make_name('os')
-        self.make_usable_boot_images(osystem=os_name)
-        self.make_usable_boot_images(osystem=os_name)
-        osystem = make_usable_osystem(self, os_name)
-        self.assertEqual(
-            [osystem], list_all_usable_osystems())
-
-    def test_list_all_usable_releases_combines_nodegroups(self):
-        expected = {}
-        osystems = []
-        os_names = [factory.make_name('os') for _ in range(3)]
-        for name in os_names:
-            releases = [factory.make_name('release') for _ in range(3)]
-            for release in releases:
-                self.make_usable_boot_images(osystem=name, release=release)
-            osystems.append(
-                make_usable_osystem(self, name, releases=releases))
-            expected[name] = releases
-        self.assertItemsEqual(expected, list_all_usable_releases(osystems))
-
-    def test_list_all_usable_releases_sorts_output(self):
-        expected = {}
-        osystems = []
-        os_names = [factory.make_name('os') for _ in range(3)]
-        for name in os_names:
-            releases = [factory.make_name('release') for _ in range(3)]
-            for release in releases:
-                self.make_usable_boot_images(osystem=name, release=release)
-            osystems.append(
-                make_usable_osystem(self, name, releases=releases))
-            expected[name] = sorted(releases)
-        self.assertEqual(expected, list_all_usable_releases(osystems))
-
-    def test_list_all_usable_releases_returns_no_duplicates(self):
-        os_name = factory.make_name('os')
-        release = factory.make_name('release')
-        self.make_usable_boot_images(osystem=os_name, release=release)
-        self.make_usable_boot_images(osystem=os_name, release=release)
-        osystem = make_usable_osystem(self, os_name, releases=[release])
-        expected = {}
-        expected[os_name] = [release]
-        self.assertEqual(expected, list_all_usable_releases([osystem]))
-
-=======
-    def test_list_all_usable_osystems_combines_nodegroups(self):
-        osystem_names = [factory.make_name('os') for _ in range(3)]
-        expected = []
-        for name in osystem_names:
-            self.make_usable_boot_images(osystem=name)
-            expected.append(make_usable_osystem(self, name))
-        self.assertItemsEqual(expected, list_all_usable_osystems())
-
-    def test_list_all_usable_osystems_sorts_output(self):
-        osystem_names = [factory.make_name('os') for _ in range(3)]
-        expected = []
-        for name in osystem_names:
-            self.make_usable_boot_images(osystem=name)
-            expected.append(make_usable_osystem(self, name))
-        expected = sorted(expected, key=lambda osystem: osystem.title)
-        self.assertEqual(expected, list_all_usable_osystems())
-
-    def test_list_all_usable_osystems_returns_no_duplicates(self):
-        os_name = factory.make_name('os')
-        self.make_usable_boot_images(osystem=os_name)
-        self.make_usable_boot_images(osystem=os_name)
-        osystem = make_usable_osystem(self, os_name)
-        self.assertEqual(
-            [osystem], list_all_usable_osystems())
-
-    def test_list_all_usable_releases_combines_nodegroups(self):
-        expected = {}
-        osystems = []
-        os_names = [factory.make_name('os') for _ in range(3)]
-        for name in os_names:
-            releases = [factory.make_name('release') for _ in range(3)]
-            for release in releases:
-                self.make_usable_boot_images(osystem=name, release=release)
-            osystems.append(
-                make_usable_osystem(self, name, releases=releases))
-            expected[name] = releases
-        self.assertItemsEqual(expected, list_all_usable_releases(osystems))
-
-    def test_list_all_usable_releases_sorts_output(self):
-        expected = {}
-        osystems = []
-        os_names = [factory.make_name('os') for _ in range(3)]
-        for name in os_names:
-            releases = [factory.make_name('release') for _ in range(3)]
-            for release in releases:
-                self.make_usable_boot_images(osystem=name, release=release)
-            osystems.append(
-                make_usable_osystem(self, name, releases=releases))
-            expected[name] = sorted(releases)
-        self.assertEqual(expected, list_all_usable_releases(osystems))
-
-    def test_list_all_usable_releases_returns_no_duplicates(self):
-        os_name = factory.make_name('os')
-        release = factory.make_name('release')
-        self.make_usable_boot_images(osystem=os_name, release=release)
-        self.make_usable_boot_images(osystem=os_name, release=release)
-        osystem = make_usable_osystem(self, os_name, releases=[release])
-        expected = {}
-        expected[os_name] = [release]
-        self.assertEqual(expected, list_all_usable_releases([osystem]))
-    
->>>>>>> MERGE-SOURCE
+    def test_list_all_usable_osystems_combines_nodegroups(self):
+        osystem_names = [factory.make_name('os') for _ in range(3)]
+        expected = []
+        for name in osystem_names:
+            self.make_usable_boot_images(osystem=name)
+            expected.append(make_usable_osystem(self, name))
+        self.assertItemsEqual(expected, list_all_usable_osystems())
+
+    def test_list_all_usable_osystems_sorts_output(self):
+        osystem_names = [factory.make_name('os') for _ in range(3)]
+        expected = []
+        for name in osystem_names:
+            self.make_usable_boot_images(osystem=name)
+            expected.append(make_usable_osystem(self, name))
+        expected = sorted(expected, key=lambda osystem: osystem.title)
+        self.assertEqual(expected, list_all_usable_osystems())
+
+    def test_list_all_usable_osystems_returns_no_duplicates(self):
+        os_name = factory.make_name('os')
+        self.make_usable_boot_images(osystem=os_name)
+        self.make_usable_boot_images(osystem=os_name)
+        osystem = make_usable_osystem(self, os_name)
+        self.assertEqual(
+            [osystem], list_all_usable_osystems())
+
+    def test_list_all_usable_releases_combines_nodegroups(self):
+        expected = {}
+        osystems = []
+        os_names = [factory.make_name('os') for _ in range(3)]
+        for name in os_names:
+            releases = [factory.make_name('release') for _ in range(3)]
+            for release in releases:
+                self.make_usable_boot_images(osystem=name, release=release)
+            osystems.append(
+                make_usable_osystem(self, name, releases=releases))
+            expected[name] = releases
+        self.assertItemsEqual(expected, list_all_usable_releases(osystems))
+
+    def test_list_all_usable_releases_sorts_output(self):
+        expected = {}
+        osystems = []
+        os_names = [factory.make_name('os') for _ in range(3)]
+        for name in os_names:
+            releases = [factory.make_name('release') for _ in range(3)]
+            for release in releases:
+                self.make_usable_boot_images(osystem=name, release=release)
+            osystems.append(
+                make_usable_osystem(self, name, releases=releases))
+            expected[name] = sorted(releases)
+        self.assertEqual(expected, list_all_usable_releases(osystems))
+
+    def test_list_all_usable_releases_returns_no_duplicates(self):
+        os_name = factory.make_name('os')
+        release = factory.make_name('release')
+        self.make_usable_boot_images(osystem=os_name, release=release)
+        self.make_usable_boot_images(osystem=os_name, release=release)
+        osystem = make_usable_osystem(self, os_name, releases=[release])
+        expected = {}
+        expected[os_name] = [release]
+        self.assertEqual(expected, list_all_usable_releases([osystem]))
+
     def test_remove_None_values_removes_None_values_in_dict(self):
         random_input = factory.getRandomString()
         self.assertEqual(
@@ -2136,8 +2062,8 @@
 
     def test_edits_boot_source_selection_object(self):
         boot_source_selection = factory.make_boot_source_selection()
-        new_release = factory.getRandomChoice(
-            DISTRO_SERIES_CHOICES)
+        ubuntu_os = UbuntuOS()
+        new_release = factory.getRandomRelease(ubuntu_os)
         params = {
             'release': new_release,
             'arches': [factory.make_name('arch'), factory.make_name('arch')],
@@ -2154,8 +2080,8 @@
 
     def test_creates_boot_source_selection_object(self):
         boot_source = factory.make_boot_source()
-        new_release = factory.getRandomChoice(
-            DISTRO_SERIES_CHOICES)
+        ubuntu_os = UbuntuOS()
+        new_release = factory.getRandomRelease(ubuntu_os)
         params = {
             'release': new_release,
             'arches': [factory.make_name('arch'), factory.make_name('arch')],
 
=== modified file 'src/maasserver/views/tests/test_settings.py'
--- src/maasserver/views/tests/test_settings.py	2014-05-29 18:21:27 +0000
+++ src/maasserver/views/tests/test_settings.py	2014-05-15 19:48:27 +0000
@@ -20,10 +20,6 @@
 from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
 from lxml.html import fromstring
-<<<<<<< TREE
-=======
-from maasserver.models.config import DEFAULT_OS
->>>>>>> MERGE-SOURCE
 from maasserver.models import (
     Config,
     UserProfile,
 
=== modified file 'src/provisioningserver/driver/__init__.py'
--- src/provisioningserver/driver/__init__.py	2014-05-15 17:27:53 +0000
+++ src/provisioningserver/driver/__init__.py	2014-05-29 18:21:27 +0000
@@ -158,6 +158,18 @@
         :returns: list of supported purposes
         """
 
+    def compose_preseed(self, node, token, metadata_url):
+        """Composes the preseed for the given node.
+
+        :param node: Node preseed needs generating.
+        :param token: OAuth token for url.
+        :param metadata_url: Metdata url for node.
+        :returns: Preseed for node.
+        :raise:
+            NotImplementedError: doesn't implement a custom preseed
+        """
+        raise NotImplementedError()
+
 
 class HardwareDiscoverContext: