Merge ~blake-rouse/maas:fix-1793340-part2 into maas:master

[Blake Rouse]

Fix issues where unique_together in the Django model (not postgresql) was preventing the new BMC migration to run.

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

[Newell Jensen (newell-jensen)]

+1

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b fix-1793340-part2 lp:~blake-rouse/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/3990/consoleText

6b45ca5... by Blake Rouse on 2018-09-26

Wedge power driver is not a chassis.

ff7b399... by Blake Rouse on 2018-09-26

Merge branch 'master' into fix-1793340-part2

2abba6d... by Blake Rouse on 2018-09-26

Fix issue with merge.

diff --git a/src/maasserver/migrations/builtin/maasserver/0177_remove_unique_together_on_bmc.py b/src/maasserver/migrations/builtin/maasserver/0177_remove_unique_together_on_bmc.py
new file mode 100644
index 0000000..7272a17
--- /dev/null
+++ b/src/maasserver/migrations/builtin/maasserver/0177_remove_unique_together_on_bmc.py
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.11 on 2018-09-25 17:03
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class AlterUniqueTogetherNoDB(migrations.AlterUniqueTogether):
+    """A `AlterUniqueTogether` that doesn't actually touch the DB it only
+    updates the model schema.
+    
+    Because of migrations:
+
+    - 0163_create_new_power_parameters_with_jsonfield
+    - 0164_copy_over_existing_power_parameters
+    - 0165_remove_and_rename_power_parameters
+
+    The unique_together was removed by PostgreSQL automatically, so performing
+    DB changes actually results in an error because it has already been
+    removed.
+    """
+
+    def database_forwards(
+            self, app_label, schema_editor, from_state, to_state):
+        # Do nothing.
+        pass
+
+    def database_backwards(
+            self, app_label, schema_editor, from_state, to_state):
+        # Do nothing.
+        pass
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('maasserver', '0176_rename_user_id_migrate_to_user_id_for_events'),
+    ]
+
+    operations = [
+        AlterUniqueTogetherNoDB(
+            name='bmc',
+            unique_together=set([]),
+        ),
+    ]
diff --git a/src/maasserver/migrations/builtin/maasserver/0177_break_apart_linked_bmcs.py b/src/maasserver/migrations/builtin/maasserver/0178_break_apart_linked_bmcs.py
index 13c26a9..19bdca0 100644
--- a/src/maasserver/migrations/builtin/maasserver/0177_break_apart_linked_bmcs.py
+++ b/src/maasserver/migrations/builtin/maasserver/0178_break_apart_linked_bmcs.py
@@ -34,7 +34,7 @@ def break_apart_linked_bmcs(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('maasserver', '0176_rename_user_id_migrate_to_user_id_for_events'),
+        ('maasserver', '0177_remove_unique_together_on_bmc'),
     ]
 
     operations = [
diff --git a/src/provisioningserver/drivers/power/wedge.py b/src/provisioningserver/drivers/power/wedge.py
index 61f89ff..9b3ca1c 100644
--- a/src/provisioningserver/drivers/power/wedge.py
+++ b/src/provisioningserver/drivers/power/wedge.py
@@ -32,7 +32,7 @@ class WedgeState:
 class WedgePowerDriver(PowerDriver):
 
     name = 'wedge'
-    chassis = True
+    chassis = False
     description = "Facebook's Wedge"
     settings = [
         make_setting_field('power_address', "IP address", required=True),