Merge lp:~blake-rouse/maas/add-boot-type-to-node into lp:~maas-committers/maas/trunk

[Blake Rouse]

Converts the use-fastpath-installer tag into a property that is set on the Node.

Adds a boot_type field to the node model. This field is used instead of the "use-fastpath-installer" tag, to determine what boot method the node should be using. Since fastpath is now the default installer, it is set as the default for the field.

The migration handles reading the "use-fastpath-installer" tag on the node, and setting the correct boot_type.

[Raphaël Badin (rvb)]

Looks good. I've got a couple of comment (see inline) but more importantly:

Now that boot_type is a property on the node, we don't really need the should_use_fastpath_installer/should_use_traditional_installer encapsulations anymore.

Actually, if you exclude the tests, should_use_fastpath_installer is used only once and should_use_traditional_installer is not even used anymore (!).

review: Approve

[Raphaël Badin (rvb)]

btw, we probably want to make sure boot_type is exposed on the API (read/write).

[Blake Rouse (blake-rouse)]

should_use_fastpath_installer/should_use_traditional_installer where removed in the following branch. Made the review very large, to remove it in this one. Wanted to keep the review as small as possible, :)

I will do a branch to make sure that boot_type is exposed over the API.

Thanks!

[Jeroen T. Vermeulen (jtv)]

We just hit trouble with this migration: http://paste.ubuntu.com/7841190/

I suspect the error may be because the migration updates a field on the model which, in the schema revision the migration works on, hasn't actually been added yet.

If it weren't for that, I think the migration would still fail for an additional reason: as it turns out you can't add a column to a database table and then start populating that column in the same transaction. You either do it right away by setting a default, or you do it in a separate transaction. (A migration runs as a transaction, of course.)

On a final nitpick, do we know that updating every node individually and querying the tags table for each will perform sufficiently well on very large numbers of nodes?

[Jeroen T. Vermeulen (jtv)]

Filed that problem as bug 1343425.

[Blake Rouse (blake-rouse)]

Thanks. Shows you are working on it. Is that correct?
On Jul 23, 2014 5:28 PM, "Jeroen T. Vermeulen" <email address hidden> wrote:

> Filed that problem as bug 1343425.
> --
>
> https://code.launchpad.net/~blake-rouse/maas/add-boot-type-to-node/+merge/227234
> You are the owner of lp:~blake-rouse/maas/add-boot-type-to-node.
>

[Jeroen T. Vermeulen (jtv)]

Yes, I'm working on that bug.

By the way, some important things to be aware of when working on database migrations: the normal things you do in development, such as "make sampledata," perform the migrations on an empty database. So any code you have in there for existing data (“for all existing nodes...”) simply won't be exercised. Yet an existing installation will run through them on upgrade.

Django/South let you step manually through the consecutive schema versions — forwards and, where the migrations themselves support it, backwards. So there is a way to verify that a migration works on existing data: ‘make sampledata’ to populate some of the tables. Then start a development instance of your branch in one shell, using ‘make run’. Ensure that you have data that will exercise the migration properly, whether through the UI or a postgres shell by running ‘make dbharness’. For convenience I'll show how to migrate backwards first and then forwards, so you'll start with data to exercise the backwards migration. Once you're sure your data is right, step through your migration backwards using maas-region-admin's ‘migrate’ sub-command, such as:

    ./bin/maas-region-admin migrate maasserver src/maasserver/migrations/0090_initialise_nodegroupinterface_name

That command will try to take you back to schema version 0090, which precedes your migration 0091. (As it happens this crashes because the backwards step in migration 0091 gets the return type from get_or_create wrong, and passes a tuple instead of a model object.)

Now you're in a state similar to what an installed maas would have before installing your upgrade. Again verify that the data is as you would expect, pre-migration, and that migrating forwards will exercise your migration code well. Then, apply your migration with a command like:

    ./bin/maas-region-admin migrate maasserver src/maasserver/migrations/0091_add_boot_type_to_node.py

Now you're in your post-migration state. Verify that the migration did what you expected it to. (In this case it would crash for the reasons I gave in my earlier comment.)

Another possible problem just occurred to me: the migration code uses node.tags — which is regular model-based ORM. However while the schema migrations walk you through consecutive database schema versions, they don't change the model code. The model code will always be the current version as received with the migrations, which will usually be for a newer schema version than the version your migration was written for. Future model code won't necessarily work with that schema version. That's why we're supposed to use the ‘orm’ object for accessing the database in migrations, not the model code.

So if (arbitrary example) we were to rename node.tags to node.tags_set at the model level, I _think_ your migration would break again.

[Jeroen T. Vermeulen (jtv)]

Did some looking around the South documentation and the Internet at large, and it looks like node.tags is still the proper way to refer to a node's tags.

(In my version of the migration, I go the other way — tag.node_set — in order to eliminate the loop that queries tags for every node.)

=== modified file 'src/maasserver/enum.py'
--- src/maasserver/enum.py	2014-07-09 16:28:38 +0000
+++ src/maasserver/enum.py	2014-07-18 14:52:34 +0000
@@ -95,6 +95,20 @@
     ADMIN = 'admin_node'
 
 
+class NODE_BOOT:
+    """Types of booting methods a node can use."""
+    FASTPATH = 'fastpath'  #: http://launchpad.net/curtin
+    DEBIAN = 'di'
+
+
+# Django choices for NODE_BOOT: sequence of tuples (key, UI
+# representation).
+NODE_BOOT_CHOICES = (
+    (NODE_BOOT.FASTPATH, "Fastpath Installer"),
+    (NODE_BOOT.DEBIAN, "Debian Installer"),
+)
+
+
 class PRESEED_TYPE:
     """Types of preseed documents that can be generated."""
     DEFAULT = ''

=== added file 'src/maasserver/migrations/0091_add_boot_type_to_node.py'
--- src/maasserver/migrations/0091_add_boot_type_to_node.py	1970-01-01 00:00:00 +0000
+++ src/maasserver/migrations/0091_add_boot_type_to_node.py	2014-07-18 14:52:34 +0000
@@ -0,0 +1,338 @@
+from maasserver.enum import NODE_BOOT
+from maasserver.models.timestampedmodel import now
+from south.db import db
+from south.v2 import SchemaMigration
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'Node.boot_type'
+        db.add_column(u'maasserver_node', 'boot_type',
+                      self.gf('django.db.models.fields.CharField')(default=u'fastpath', max_length=20),
+                      keep_default=False)
+
+        # Set the boot_type based on the tag set on Node.
+        for node in orm['maasserver.Node'].objects.all():
+            if node.tags.filter(name="use-fastpath-installer").exists():
+                node.boot_type = NODE_BOOT.FASTPATH
+            else:
+                node.boot_type = NODE_BOOT.DEBIAN
+            node.save()
+
+        # Delete the "use-fastpath-installer" tag, as it is no longer used
+        orm['maasserver.Tag'].objects.filter(
+            name="use-fastpath-installer").delete()
+
+
+    def backwards(self, orm):
+        # Create the "use-fastpath-installer" tag.
+        current_time = now()
+        fpi_tag = orm['maasserver.Tag'].objects.get_or_create(
+            name="use-fastpath-installer", defaults={
+                'created': current_time,
+                'updated': current_time,
+                })
+
+        # Add the "use-fastpath-installer" tag, to nodes that use that
+        # boot_type.
+        for node in orm['maasserver.Node'].objects.all():
+            if node.boot_type == NODE_BOOT.FASTPATH:
+                node.tags.add(fpi_tag)
+            elif node.boot_type == NODE_BOOT.DEBIAN:
+                if fpi_tag in node.tags.all():
+                    node.tags.remove(fpi_tag)
+            node.save()
+
+        # Deleting field 'Node.boot_type'
+        db.delete_column(u'maasserver_node', 'boot_type')
+
+
+    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'}),
+            'supported_subarches': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {}),
+            'xinstall_path': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'xinstall_type': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '30', 'null': 'True', 'blank': 'True'})
+        },
+        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': ('maasserver.fields.EditableBinaryField', [], {'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', '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': ('maasserver.fields.MAASIPAddressField', [], {'unique': 'True', 'max_length': '39'}),
+            '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'a95c24b8-0dbb-11e4-a6c6-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.licensekey': {
+            'Meta': {'unique_together': "((u'osystem', u'distro_series'),)", 'object_name': 'LicenseKey'},
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'distro_series': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'license_key': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'osystem': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        u'maasserver.macaddress': {
+            'Meta': {'object_name': 'MACAddress'},
+            'cluster_interface': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['maasserver.NodeGroupInterface']", 'null': 'True', 'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ip_addresses': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['maasserver.StaticIPAddress']", 'symmetrical': 'False', 'through': u"orm['maasserver.MACStaticIPAddressLink']", 'blank': '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.macstaticipaddresslink': {
+            'Meta': {'unique_together': "((u'ip_address', u'mac_address'),)", 'object_name': 'MACStaticIPAddressLink'},
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ip_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.StaticIPAddress']", 'unique': 'True'}),
+            'mac_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.MACAddress']"}),
+            'nic_alias': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            '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': ('maasserver.fields.MAASIPAddressField', [], {'unique': 'True', 'max_length': '39'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'netmask': ('maasserver.fields.MAASIPAddressField', [], {'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'}),
+            'boot_type': ('django.db.models.fields.CharField', [], {'default': "u'fastpath'", 'max_length': '20'}),
+            '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', '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'}),
+            'license_key': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': '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', '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-a95b43ea-0dbb-11e4-a6c6-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'name'),)", 'object_name': 'NodeGroupInterface'},
+            'broadcast_ip': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'foreign_dhcp_ip': ('maasserver.fields.MAASIPAddressField', [], {'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': ('maasserver.fields.MAASIPAddressField', [], {'max_length': '39'}),
+            'ip_range_high': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'ip_range_low': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'management': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'name': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
+            'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}),
+            'router_ip': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'static_ip_range_high': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'static_ip_range_low': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'subnet_mask': ('maasserver.fields.MAASIPAddressField', [], {'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.sslkey': {
+            'Meta': {'unique_together': "((u'user', u'key'),)", 'object_name': 'SSLKey'},
+            '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.staticipaddress': {
+            'Meta': {'object_name': 'StaticIPAddress'},
+            'alloc_type': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ip': ('maasserver.fields.MAASIPAddressField', [], {'unique': 'True', 'max_length': '39'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        },
+        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': '1405606037L'}),
+            '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']

=== modified file 'src/maasserver/models/node.py'
--- src/maasserver/models/node.py	2014-07-16 02:34:10 +0000
+++ src/maasserver/models/node.py	2014-07-18 14:52:34 +0000
@@ -51,6 +51,8 @@
     logger,
     )
 from maasserver.enum import (
+    NODE_BOOT,
+    NODE_BOOT_CHOICES,
     NODE_PERMISSION,
     NODE_STATUS,
     NODE_STATUS_CHOICES,
@@ -500,6 +502,8 @@
     :ivar status: This `Node`'s status. See the vocabulary
         :class:`NODE_STATUS`.
     :ivar owner: This `Node`'s owner if it's in use, None otherwise.
+    :ivar boot_type: This `Node`'s booting method. See the vocabulary
+        :class:`NODE_BOOT`.
     :ivar osystem: This `Node`'s booting operating system, if it's blank then
         the default_osystem will be used.
     :ivar distro_series: This `Node`'s booting distro series, if
@@ -531,6 +535,9 @@
     owner = ForeignKey(
         User, default=None, blank=True, null=True, editable=False)
 
+    boot_type = CharField(
+        max_length=20, choices=NODE_BOOT_CHOICES, default=NODE_BOOT.FASTPATH)
+
     osystem = CharField(
         max_length=20, blank=True, default='')
 
@@ -1158,58 +1165,24 @@
     def should_use_traditional_installer(self):
         """Should this node be installed with the traditional installer?
 
-        By default, nodes should be installed with the traditional installer,
-        so this returns `True` when no `use-fastpath-installer` tag has been
-        defined.
+        By default, nodes should be installed with the Fast Path installer.
         """
-        return not self.should_use_fastpath_installer()
+        return self.boot_type == NODE_BOOT.DEBIAN
 
     def should_use_fastpath_installer(self):
         """Should this node be installed with the Fast Path installer?
 
-        By default, nodes should be installed with the traditional installer,
-        so this returns `True` when the `use-fastpath-installer` has been
-        defined and `False` when it hasn't.
+        By default, nodes should be installed with the Fast Path installer.
         """
-        return self.tags.filter(name="use-fastpath-installer").exists()
+        return self.boot_type == NODE_BOOT.FASTPATH
 
     def use_traditional_installer(self):
-        """Set this node to be installed with the traditional installer.
-
-        By default, nodes should be installed with the Traditional installer.
-
-        :raises: :class:`RuntimeError` when the `use-traditional-installer`
-            tag is defined *with* an expression. The reason is that the tag
-            evaluation machinery will eventually ignore whatever changes you
-            make with this method.
-        """
-        uti_tag, _ = Tag.objects.get_or_create(
-            name="use-fastpath-installer")
-        if uti_tag.is_defined:
-            raise RuntimeError(
-                "The use-fastpath-installer tag is defined with an "
-                "expression. This expression must instead be updated to set "
-                "this node to install with the Debian installer.")
-        self.tags.remove(uti_tag)
+        """Set this node to be installed with the traditional installer."""
+        self.boot_type = NODE_BOOT.DEBIAN
 
     def use_fastpath_installer(self):
-        """Set this node to be installed with the Fast Path Installer.
-
-        By default, nodes should be installed with the Traditional Installer.
-
-        :raises: :class:`RuntimeError` when the `use-fastpath-installer`
-            tag is defined *with* an expression. The reason is that the tag
-            evaluation machinery will eventually ignore whatever changes you
-            make with this method.
-        """
-        uti_tag, _ = Tag.objects.get_or_create(
-            name="use-fastpath-installer")
-        if uti_tag.is_defined:
-            raise RuntimeError(
-                "The use-fastpath-installer tag is defined with an "
-                "expression. This expression must instead be updated to set "
-                "this node to install with the fast installer.")
-        self.tags.add(uti_tag)
+        """Set this node to be installed with the Fast Path Installer."""
+        self.boot_type = NODE_BOOT.FASTPATH
 
     def split_arch(self):
         """Return architecture and subarchitecture, as a tuple."""

=== modified file 'src/maasserver/models/tests/test_node.py'
--- src/maasserver/models/tests/test_node.py	2014-07-16 14:12:13 +0000
+++ src/maasserver/models/tests/test_node.py	2014-07-18 14:52:34 +0000
@@ -23,6 +23,7 @@
 from maasserver.clusterrpc.power_parameters import get_power_types
 from maasserver.enum import (
     IPADDRESS_TYPE,
+    NODE_BOOT,
     NODE_PERMISSION,
     NODE_STATUS,
     NODE_STATUS_CHOICES,
@@ -41,7 +42,6 @@
     MACAddress,
     Node,
     node as node_module,
-    Tag,
     )
 from maasserver.models.node import (
     generate_hostname,
@@ -1025,28 +1025,26 @@
         expected_hostname = '%s.%s' % (hostname_without_domain, domain)
         self.assertEqual(expected_hostname, node.fqdn)
 
-    def test_should_use_traditional_installer_by_default(self):
+    def test_boot_type_has_fastpath_set_by_default(self):
         node = factory.make_node()
+        self.assertEqual(NODE_BOOT.FASTPATH, node.boot_type)
+
+    def test_should_use_traditional_installer_returns_True_for_debian(self):
+        node = factory.make_node(boot_type=NODE_BOOT.DEBIAN)
         self.assertTrue(node.should_use_traditional_installer())
 
-    def test_should_not_use_fastpath_installer_by_default(self):
-        node = factory.make_node()
-        self.assertFalse(node.should_use_fastpath_installer())
-
-    def test_should_use_traditional_installer_not_when_tag_applies(self):
-        node = factory.make_node()
-        tag = factory.make_tag(name="use-fastpath-installer")
-        tag.save()
-        node.tags.add(tag)
+    def test_should_use_traditional_installer_returns_False_for_fastpath(self):
+        node = factory.make_node(boot_type=NODE_BOOT.FASTPATH)
         self.assertFalse(node.should_use_traditional_installer())
 
-    def test_should_use_fastpath_installer_when_tag_applies(self):
-        node = factory.make_node()
-        tag = factory.make_tag(name="use-fastpath-installer")
-        tag.save()
-        node.tags.add(tag)
+    def test_should_use_fastpath_installer_returns_True_for_fastpath(self):
+        node = factory.make_node(boot_type=NODE_BOOT.FASTPATH)
         self.assertTrue(node.should_use_fastpath_installer())
 
+    def test_should_use_fastpath_installer_returns_False_for_debian(self):
+        node = factory.make_node(boot_type=NODE_BOOT.DEBIAN)
+        self.assertFalse(node.should_use_fastpath_installer())
+
     def test_use_xxx_installer(self):
         # use_fastpath_installer() and use_traditional_installer() can be used
         # to affect what the should_use_xxx_installer() methods return.
@@ -1058,56 +1056,6 @@
         self.assertTrue(node.should_use_fastpath_installer())
         self.assertFalse(node.should_use_traditional_installer())
 
-    def test_use_traditional_installer_dissociates_tag_from_node(self):
-        # use_traditional_installer removes any association with the
-        # use-fastpath-installer tag. The tag is created even if it did not
-        # previously exist. If it does already exist, it is not deleted.
-        find_tag = lambda: list(
-            Tag.objects.filter(name="use-fastpath-installer"))
-        node = factory.make_node()
-        node.use_traditional_installer()
-        self.assertNotEqual([], find_tag())
-        node.use_fastpath_installer()
-        node.use_traditional_installer()
-        self.assertNotEqual([], find_tag())
-
-    def test_use_fastpath_installer_associates_tag_with_node(self):
-        # use_traditional_installer() creates the use-traditional-installer
-        # tag when it is first needed, and associates it with the node.
-        find_tag = lambda: list(
-            Tag.objects.filter(name="use-fastpath-installer"))
-        self.assertEqual([], find_tag())
-        node = factory.make_node()
-        node.use_fastpath_installer()
-        self.assertNotEqual([], find_tag())
-
-    def test_use_traditional_installer_complains_when_tag_has_expression(self):
-        # use_traditional_installer() complains when the use-fastpath-installer
-        # tag exists and is defined with an expression.
-        node = factory.make_node()
-        factory.make_tag(
-            name="use-fastpath-installer",
-            definition="//something")
-        error = self.assertRaises(
-            RuntimeError, node.use_traditional_installer)
-        self.assertIn(
-            "The use-fastpath-installer tag is defined with an expression",
-            unicode(error))
-
-    def test_use_fastpath_installer_complains_when_tag_has_expression(self):
-        # use_fastpath_installer() complains when the
-        # use-fastpath-installer tag exists and is defined with an
-        # expression.
-        node = factory.make_node()
-        factory.make_tag(
-            name="use-fastpath-installer",
-            definition="//something")
-        error = self.assertRaises(
-            RuntimeError, node.use_fastpath_installer)
-        self.assertIn(
-            "The use-fastpath-installer tag is defined with an expression",
-            unicode(error))
-
     def test_split_arch_returns_arch_as_tuple(self):
         main_arch = factory.make_name('arch')
         sub_arch = factory.make_name('subarch')

=== modified file 'src/maasserver/node_action.py'
--- src/maasserver/node_action.py	2014-07-11 13:28:41 +0000
+++ src/maasserver/node_action.py	2014-07-18 14:52:34 +0000
@@ -35,6 +35,7 @@
 
 from django.core.urlresolvers import reverse
 from maasserver.enum import (
+    NODE_BOOT,
     NODE_PERMISSION,
     NODE_STATUS,
     NODE_STATUS_CHOICES_DICT,
@@ -48,7 +49,6 @@
     Node,
     SSHKey,
     )
-from maasserver.models.tag import Tag
 from maasserver.utils import map_enum
 
 # All node statuses.
@@ -212,25 +212,14 @@
 
     def is_permitted(self):
         permitted = super(UseCurtin, self).is_permitted()
-        return permitted and self.node.should_use_traditional_installer()
+        return permitted and self.node.boot_type == NODE_BOOT.DEBIAN
 
     def execute(self, allow_redirect=True):
         """See `NodeAction.execute`."""
-        self.node.use_fastpath_installer()
+        self.node.boot_type = NODE_BOOT.FASTPATH
+        self.node.save()
         return "Node marked as using curtin for install."
 
-    def inhibit(self):
-        """Inhibit if ``use-fastpath-installer`` uses an expression."""
-        tag, _ = Tag.objects.get_or_create(name="use-fastpath-installer")
-        if tag.is_defined:
-            return dedent("""\
-            The use-fastpath-installer tag is defined with an
-            expression. This expression must instead be updated to set
-            this node to install with the fast installer.
-            """)
-        else:
-            return None
-
 
 class UseDI(NodeAction):
     """Set this node to use d-i for installation."""
@@ -242,25 +231,14 @@
 
     def is_permitted(self):
         permitted = super(UseDI, self).is_permitted()
-        return permitted and self.node.should_use_fastpath_installer()
+        return permitted and self.node.boot_type == NODE_BOOT.FASTPATH
 
     def execute(self, allow_redirect=True):
         """See `NodeAction.execute`."""
-        self.node.use_traditional_installer()
+        self.node.boot_type = NODE_BOOT.DEBIAN
+        self.node.save()
         return "Node marked as using the Debian installer."
 
-    def inhibit(self):
-        """Inhibit if ``use-fastpath-installer`` uses an expression."""
-        tag, _ = Tag.objects.get_or_create(name="use-fastpath-installer")
-        if tag.is_defined:
-            return dedent("""\
-            The use-fastpath-installer tag is defined with an
-            expression. This expression must instead be updated to set
-            this node to install with the Debian installer.
-            """)
-        else:
-            return None
-
 
 class StartNode(NodeAction):
     """Acquire and start a node."""

=== modified file 'src/maasserver/tests/test_node_action.py'
--- src/maasserver/tests/test_node_action.py	2014-07-16 14:12:13 +0000
+++ src/maasserver/tests/test_node_action.py	2014-07-18 14:52:34 +0000
@@ -18,6 +18,7 @@
 
 from django.core.urlresolvers import reverse
 from maasserver.enum import (
+    NODE_BOOT,
     NODE_PERMISSION,
     NODE_STATUS,
     NODE_STATUS_CHOICES,
@@ -316,75 +317,45 @@
 
 class TestUseCurtinNodeAction(MAASServerTestCase):
 
-    def test_sets_tag(self):
+    def test_sets_boot_type(self):
         user = factory.make_user()
-        node = factory.make_node(owner=user)
-        node.use_traditional_installer()
+        node = factory.make_node(owner=user, boot_type=NODE_BOOT.DEBIAN)
         action = UseCurtin(node, user)
         self.assertTrue(action.is_permitted())
         action.execute()
-        self.assertTrue(node.should_use_fastpath_installer())
+        self.assertEqual(NODE_BOOT.FASTPATH, node.boot_type)
 
     def test_requires_edit_permission(self):
         user = factory.make_user()
-        node = factory.make_node()
-        node.use_traditional_installer()
+        node = factory.make_node(boot_type=NODE_BOOT.DEBIAN)
         self.assertFalse(UseCurtin(node, user).is_permitted())
 
     def test_not_permitted_if_already_uses_curtin(self):
-        node = factory.make_node()
-        node.use_fastpath_installer()
+        node = factory.make_node(boot_type=NODE_BOOT.FASTPATH)
         user = factory.make_admin()
         self.assertFalse(UseCurtin(node, user).is_permitted())
 
-    def test_inhibited_if_use_fastpath_installer_tag_uses_expr(self):
-        make_use_fastpath_installer_tag_with_expression()
-        node = factory.make_node()
-        user = factory.make_admin()
-        self.assertDocTestMatches(
-            """\
-            The use-fastpath-installer tag is defined with an
-            expression. This expression must instead be updated to set
-            this node to install with the fast installer.
-            """,
-            UseCurtin(node, user).inhibit())
-
 
 class TestUseDINodeAction(MAASServerTestCase):
 
-    def test_sets_tag(self):
+    def test_sets_boot_type(self):
         user = factory.make_user()
-        node = factory.make_node(owner=user)
-        node.use_fastpath_installer()
+        node = factory.make_node(owner=user, boot_type=NODE_BOOT.FASTPATH)
         action = UseDI(node, user)
         self.assertTrue(action.is_permitted())
         action.execute()
-        self.assertTrue(node.should_use_traditional_installer())
+        self.assertEqual(NODE_BOOT.DEBIAN, node.boot_type)
 
     def test_requires_edit_permission(self):
         user = factory.make_user()
-        node = factory.make_node()
-        node.use_fastpath_installer()
+        node = factory.make_node(boot_type=NODE_BOOT.FASTPATH)
         self.assertFalse(UseDI(node, user).is_permitted())
 
     def test_not_permitted_if_already_uses_di(self):
-        node = factory.make_node()
-        node.use_traditional_installer()
+        node = factory.make_node(boot_type=NODE_BOOT.DEBIAN)
         user = factory.make_admin()
         self.assertFalse(UseDI(node, user).is_permitted())
 
-    def test_inhibited_if_use_fastpath_installer_tag_uses_expr(self):
-        make_use_fastpath_installer_tag_with_expression()
-        node = factory.make_node()
-        user = factory.make_admin()
-        self.assertDocTestMatches(
-            """\
-            The use-fastpath-installer tag is defined with an
-            expression. This expression must instead be updated to set
-            this node to install with the Debian installer.
-            """,
-            UseDI(node, user).inhibit())
-
 
 class TestMarkBrokenAction(MAASServerTestCase):