Merge lp:~blake-rouse/maas/fix-power8-1.9 into lp:maas/1.9

[Blake Rouse]

Fix storage configuration so it adds a prep partition at the beginning of the disk for deploying PowerNV. Fix PowerNV and PowerKVM to not create the EFI partition when the storage layout is generated.

[Blake Rouse (blake-rouse)]

Backport self-review: https://code.launchpad.net/~blake-rouse/maas/fix-power8/+merge/285234

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~blake-rouse/maas/fix-power8-1.9 into lp:maas/1.9 failed. Below is the output from the failed tests.

Ign http://prodstack-zone-1.clouds.archive.ubuntu.com trusty InRelease
Get:1 http://security.ubuntu.com trusty-security InRelease [65.9 kB]
Get:2 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates InRelease [65.9 kB]
Get:3 http://security.ubuntu.com trusty-security/main Sources [105 kB]
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports InRelease
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty Release.gpg
Get:4 http://security.ubuntu.com trusty-security/universe Sources [33.0 kB]
Get:5 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/main Sources [260 kB]
Get:6 http://security.ubuntu.com trusty-security/main amd64 Packages [427 kB]
Get:7 http://security.ubuntu.com trusty-security/universe amd64 Packages [123 kB]
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Get:8 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/restricted Sources [5,352 B]
Get:9 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/universe Sources [150 kB]
Get:10 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/multiverse Sources [5,547 B]
Get:11 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [709 kB]
Get:12 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/restricted amd64 Packages [15.9 kB]
Get:13 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [338 kB]
Get:14 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/multiverse amd64 Packages [13.2 kB]
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/multiverse Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/restricted Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/main Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/restricted Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/universe Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/multiverse Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/main amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/restricted amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/universe amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/multiverse amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/main Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/multiverse Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/restricted Translation-en
Hit http://prodstack-zone-1.clouds.archive...

=== modified file 'docs/changelog.rst'
--- docs/changelog.rst	2016-01-26 00:26:34 +0000
+++ docs/changelog.rst	2016-02-24 16:23:03 +0000
@@ -8,14 +8,17 @@
 
 See https://launchpad.net/maas/+milestone/1.9.1 for full details.
 
-Minor bugs fixed in this release
---------------------------------
-
-LP: #1536754    Upgrade from 1.8 to 1.9 lost connected macs in all but one network
-
 Bug Fix Update
 --------------
 
+#1523779    Fix grub-install error on deploying power8 machines.
+
+#1526542    Skip block devices with duplicate serial numbers to fix multipath issue.
+
+#1536754    Upgrade from 1.8 to 1.9 lost connected macs in all but one network.
+
+#1532262    Fix failure to power query requests for SM15K servers.
+
 #1484696    Fix bug in apache2 maas config where it will reuse websocket connections
             to work around a bug in apache2 itself.
 
 
=== modified file 'src/maasserver/models/node.py'
--- src/maasserver/models/node.py	2015-11-30 07:50:50 +0000
+++ src/maasserver/models/node.py	2016-02-24 16:23:03 +0000
@@ -155,7 +155,7 @@
 
 # Holds the known `bios_boot_methods`. If `bios_boot_method` is not in this
 # list then it will fallback to `DEFAULT_BIOS_BOOT_METHOD`.
-KNOWN_BIOS_BOOT_METHODS = ["pxe", "uefi"]
+KNOWN_BIOS_BOOT_METHODS = ["pxe", "uefi", "powernv", "powerkvm"]
 
 # Default `bios_boot_method`. See `KNOWN_BIOS_BOOT_METHOD` above for usage.
 DEFAULT_BIOS_BOOT_METHOD = "pxe"
@@ -837,8 +837,8 @@
         """Return true if the node is connected to a managed network."""
         for interface in self.interface_set.all():
             for link in interface.get_links():
-                if (link['mode'] != INTERFACE_LINK_TYPE.LINK_UP
-                        and 'subnet' in link):
+                if (link['mode'] != INTERFACE_LINK_TYPE.LINK_UP and
+                        'subnet' in link):
                     return True
         return False
 
 
=== modified file 'src/maasserver/models/partition.py'
--- src/maasserver/models/partition.py	2015-11-17 23:19:51 +0000
+++ src/maasserver/models/partition.py	2016-02-24 16:23:03 +0000
@@ -189,7 +189,17 @@
         partitions_in_table = sorted(partitions_in_table, key=attrgetter('id'))
         idx = partitions_in_table.index(self)
         if self.partition_table.table_type == PARTITION_TABLE_TYPE.GPT:
-            return idx + 1
+            # ppc64el machines get part1 skipped when this partition is on
+            # the boot disk. This is because the prep partition is part1 and
+            # is added when the preseed for storage is generated.
+            node = self.get_node()
+            arch, _ = node.split_arch()
+            boot_disk = node.get_boot_disk()
+            if (arch == "ppc64el" and
+                    self.partition_table.block_device.id == boot_disk.id):
+                return idx + 2
+            else:
+                return idx + 1
         elif self.partition_table.table_type == PARTITION_TABLE_TYPE.MBR:
             # If more than 4 partitions then the 4th partition number is
             # skipped because that is used for the extended partition.
 
=== modified file 'src/maasserver/models/partitiontable.py'
--- src/maasserver/models/partitiontable.py	2015-11-17 23:19:51 +0000
+++ src/maasserver/models/partitiontable.py	2016-02-24 16:23:03 +0000
@@ -49,6 +49,13 @@
 PARTITION_TABLE_EXTRA_SPACE = (
     INITIAL_PARTITION_OFFSET + END_OF_PARTITION_TABLE_SPACE)
 
+# The amount of space required to be reserved for the prep partition. Prep
+# partition is required by all ppc64el architectures. Because of the way the
+# system boots it requires that a 8MiB prep partition exist with grub installed
+# on that partition. Without this partition the installation of grub will fail
+# on ppc64el and will fail to boot.
+PREP_PARTITION_SIZE = 8 * 1024 * 1024  # 8MiB
+
 
 class PartitionTable(CleanSave, TimestampedModel):
     """A partition table on a block device.
@@ -73,7 +80,7 @@
     def get_size(self):
         """Total usable size of partition table."""
         return round_size_to_nearest_block(
-            self.block_device.size - PARTITION_TABLE_EXTRA_SPACE,
+            self.block_device.size - self.get_overhead_size(),
             PARTITION_ALIGNMENT_SIZE,
             False)
 
@@ -81,6 +88,15 @@
         """Block size of partition table."""
         return self.block_device.block_size
 
+    def get_overhead_size(self):
+        """Return the total amount of extra space this partition table
+        requires."""
+        extra_space = PARTITION_TABLE_EXTRA_SPACE
+        node_arch, _ = self.block_device.node.split_arch()
+        if node_arch == "ppc64el":
+            extra_space += PREP_PARTITION_SIZE
+        return extra_space
+
     def get_used_size(self, ignore_partitions=[]):
         """Return the used size of partitions on the table."""
         ignore_ids = [
@@ -93,7 +109,7 @@
         if used_size is None:
             used_size = 0
         # The extra space taken by the partition table header is used space.
-        return used_size + PARTITION_TABLE_EXTRA_SPACE
+        return used_size + self.get_overhead_size()
 
     def get_available_size(self, ignore_partitions=[]):
         """Return the remaining size available for partitions."""
@@ -143,8 +159,8 @@
             # placed on the boot disk.
             if boot_disk is not None and self.block_device.id == boot_disk.id:
                 bios_boot_method = node.get_bios_boot_method()
-                if bios_boot_method == "uefi":
-                    # UEFI must always use a GPT table.
+                if bios_boot_method in ["uefi", "powernv", "powerkvm"]:
+                    # UEFI, PowerNV, or PowerKVM must always use a GPT table.
                     if not self.table_type:
                         self.table_type = PARTITION_TABLE_TYPE.GPT
                     elif self.table_type != PARTITION_TABLE_TYPE.GPT:
 
=== modified file 'src/maasserver/models/tests/test_node.py'
--- src/maasserver/models/tests/test_node.py	2015-11-21 02:16:17 +0000
+++ src/maasserver/models/tests/test_node.py	2016-02-24 16:23:03 +0000
@@ -242,6 +242,14 @@
         node = factory.make_Node(bios_boot_method="uefi")
         self.assertEquals("uefi", node.get_bios_boot_method())
 
+    def test_get_bios_boot_method_returns_powernv(self):
+        node = factory.make_Node(bios_boot_method="powernv")
+        self.assertEqual("powernv", node.get_bios_boot_method())
+
+    def test_get_bios_boot_method_returns_powerkvm(self):
+        node = factory.make_Node(bios_boot_method="powerkvm")
+        self.assertEqual("powerkvm", node.get_bios_boot_method())
+
     def test_get_bios_boot_method_fallback_to_pxe(self):
         node = factory.make_Node(bios_boot_method=factory.make_name("boot"))
         self.assertEquals("pxe", node.get_bios_boot_method())
 
=== modified file 'src/maasserver/models/tests/test_partition.py'
--- src/maasserver/models/tests/test_partition.py	2015-11-17 23:19:51 +0000
+++ src/maasserver/models/tests/test_partition.py	2016-02-24 16:23:03 +0000
@@ -31,7 +31,10 @@
     Partition,
     PARTITION_ALIGNMENT_SIZE,
 )
-from maasserver.models.partitiontable import PARTITION_TABLE_EXTRA_SPACE
+from maasserver.models.partitiontable import (
+    PARTITION_TABLE_EXTRA_SPACE,
+    PREP_PARTITION_SIZE,
+)
 from maasserver.testing.factory import factory
 from maasserver.testing.orm import reload_object
 from maasserver.testing.testcase import MAASServerTestCase
@@ -311,6 +314,27 @@
             self.expectThat(idx, Equals(partition.get_partition_number()))
             idx += 1
 
+    def test_get_partition_number_returns_starting_at_2_for_ppc64el(self):
+        node = factory.make_Node(
+            architecture="ppc64el/generic", bios_boot_method="uefi")
+        block_device = factory.make_PhysicalBlockDevice(
+            node=node,
+            size=(
+                (MIN_PARTITION_SIZE * 4) + PARTITION_TABLE_EXTRA_SPACE +
+                PREP_PARTITION_SIZE))
+        node.boot_disk = block_device
+        node.save()
+        partition_table = factory.make_PartitionTable(
+            block_device=block_device, table_type=PARTITION_TABLE_TYPE.GPT)
+        partitions = [
+            partition_table.add_partition(size=MIN_BLOCK_DEVICE_SIZE)
+            for _ in range(4)
+        ]
+        idx = 2
+        for partition in partitions:
+            self.expectThat(idx, Equals(partition.get_partition_number()))
+            idx += 1
+
     def test_get_partition_number_returns_correct_numbering_for_mbr(self):
         block_device = factory.make_PhysicalBlockDevice(
             size=(MIN_BLOCK_DEVICE_SIZE * 6) + PARTITION_TABLE_EXTRA_SPACE)
 
=== modified file 'src/maasserver/models/tests/test_partitiontable.py'
--- src/maasserver/models/tests/test_partitiontable.py	2015-11-17 23:19:51 +0000
+++ src/maasserver/models/tests/test_partitiontable.py	2016-02-24 16:23:03 +0000
@@ -28,7 +28,10 @@
     MIN_PARTITION_SIZE,
     PARTITION_ALIGNMENT_SIZE,
 )
-from maasserver.models.partitiontable import PARTITION_TABLE_EXTRA_SPACE
+from maasserver.models.partitiontable import (
+    PARTITION_TABLE_EXTRA_SPACE,
+    PREP_PARTITION_SIZE,
+)
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase
 from maasserver.utils.converters import round_size_to_nearest_block
@@ -52,6 +55,19 @@
                 False),
             partition_table.get_size())
 
+    def test_get_size_returns_block_device_size_minus_ppc64el(self):
+        node = factory.make_Node(architecture="ppc64el/generic")
+        block_device = factory.make_PhysicalBlockDevice(node=node)
+        partition_table = factory.make_PartitionTable(
+            block_device=block_device)
+        self.assertEqual(
+            round_size_to_nearest_block(
+                partition_table.block_device.size -
+                PARTITION_TABLE_EXTRA_SPACE - PREP_PARTITION_SIZE,
+                PARTITION_ALIGNMENT_SIZE,
+                False),
+            partition_table.get_size())
+
     def test_get_block_size_returns_block_device_block_size(self):
         partition_table = factory.make_PartitionTable()
         self.assertEquals(
@@ -123,6 +139,24 @@
         self.assertRaises(
             ValidationError, partition_table.add_partition)
 
+    def test_get_overhead_size(self):
+        node = factory.make_Node(bios_boot_method="pxe")
+        block_device = factory.make_PhysicalBlockDevice(node=node)
+        partition_table = factory.make_PartitionTable(
+            block_device=block_device)
+        self.assertEquals(
+            PARTITION_TABLE_EXTRA_SPACE,
+            partition_table.get_overhead_size())
+
+    def test_get_overhead_size_for_ppc64el(self):
+        node = factory.make_Node(architecture="ppc64el/generic")
+        block_device = factory.make_PhysicalBlockDevice(node=node)
+        partition_table = factory.make_PartitionTable(
+            block_device=block_device)
+        self.assertEquals(
+            PARTITION_TABLE_EXTRA_SPACE + PREP_PARTITION_SIZE,
+            partition_table.get_overhead_size())
+
     def test_get_available_size(self):
         block_size = 4096
         device = factory.make_BlockDevice(
@@ -162,6 +196,20 @@
         partition_table = factory.make_PartitionTable(block_device=boot_disk)
         self.assertEquals(PARTITION_TABLE_TYPE.GPT, partition_table.table_type)
 
+    def test_save_sets_table_type_to_gpt_for_powernv_boot(self):
+        node = factory.make_Node(
+            with_boot_disk=False, bios_boot_method="powernv")
+        boot_disk = factory.make_PhysicalBlockDevice(node=node)
+        partition_table = factory.make_PartitionTable(block_device=boot_disk)
+        self.assertEqual(PARTITION_TABLE_TYPE.GPT, partition_table.table_type)
+
+    def test_save_sets_table_type_to_gpt_for_powerkvm_boot(self):
+        node = factory.make_Node(
+            with_boot_disk=False, bios_boot_method="powerkvm")
+        boot_disk = factory.make_PhysicalBlockDevice(node=node)
+        partition_table = factory.make_PartitionTable(block_device=boot_disk)
+        self.assertEqual(PARTITION_TABLE_TYPE.GPT, partition_table.table_type)
+
     def test_save_sets_table_type_to_gpt_for_none_boot_disk(self):
         node = factory.make_Node(with_boot_disk=False, bios_boot_method="pxe")
         factory.make_PhysicalBlockDevice(node=node)
 
=== modified file 'src/maasserver/preseed_storage.py'
--- src/maasserver/preseed_storage.py	2015-10-29 16:39:49 +0000
+++ src/maasserver/preseed_storage.py	2016-02-24 16:23:03 +0000
@@ -22,7 +22,10 @@
     FILESYSTEM_TYPE,
     PARTITION_TABLE_TYPE,
 )
-from maasserver.models.partitiontable import INITIAL_PARTITION_OFFSET
+from maasserver.models.partitiontable import (
+    INITIAL_PARTITION_OFFSET,
+    PREP_PARTITION_SIZE,
+)
 from maasserver.models.physicalblockdevice import PhysicalBlockDevice
 from maasserver.models.virtualblockdevice import VirtualBlockDevice
 import yaml
@@ -34,6 +37,7 @@
     def __init__(self, node):
         self.node = node
         self.boot_disk = node.get_boot_disk()
+        self.boot_disk_first_partition = None
         self.operations = {
             "disk": [],
             "partition": [],
@@ -111,6 +115,13 @@
                 raise ValueError("Unknown block device instance: %s" % (
                     block_device.__class__.__name__))
 
+    def _requires_prep_partition(self, block_device):
+        """Return True if block device requires the prep partition."""
+        arch, _ = self.node.split_arch()
+        return (
+            self.boot_disk.id == block_device.id and
+            arch == "ppc64el")
+
     def _add_partition_operations(self):
         """Add all the partition operations.
 
@@ -118,9 +129,16 @@
         attached to the node.
         """
         for block_device in self.node.blockdevice_set.order_by('id'):
+            requires_prep = self._requires_prep_partition(block_device)
             partition_table = block_device.get_partitiontable()
             if partition_table is not None:
-                for partition in partition_table.partitions.order_by('id'):
+                partitions = list(partition_table.partitions.order_by('id'))
+                for idx, partition in enumerate(partitions):
+                    # If this is the last partition and prep partition is
+                    # required then set boot_disk_first_partition so extra
+                    # space can be removed.
+                    if requires_prep and idx == 0:
+                        self.boot_disk_first_partition = partition
                     self.operations["partition"].append(partition)
 
     def _add_format_and_mount_operations(self):
@@ -180,21 +198,35 @@
 
         # Set the partition table type if a partition table exists or if this
         # is the boot disk.
+        add_prep_partition = False
         partition_table = block_device.get_partitiontable()
         if partition_table is not None:
             disk_operation["ptable"] = self._get_ptable_type(
                 partition_table)
         elif block_device.id == self.boot_disk.id:
-            if self.node.get_bios_boot_method() == "uefi":
+            bios_boot_method = self.node.get_bios_boot_method()
+            node_arch, _ = self.node.split_arch()
+            if bios_boot_method in [
+                    "uefi", "powernv", "powerkvm"]:
                 disk_operation["ptable"] = "gpt"
+                if node_arch == "ppc64el":
+                    add_prep_partition = True
             else:
                 disk_operation["ptable"] = "msdos"
 
-        # Set this disk to be the grub device if its the boot disk.
-        if self.boot_disk == block_device:
+        # Set this disk to be the grub device if it's the boot disk and doesn't
+        # require a prep partition. When a prep partition is required grub
+        # must be installed on that partition and not in the partition header
+        # of that disk.
+        requires_prep = self._requires_prep_partition(block_device)
+        if self.boot_disk.id == block_device.id and not requires_prep:
             disk_operation["grub_device"] = True
         self.storage_config.append(disk_operation)
 
+        # Add the prep partition at the end of the disk when it is required.
+        if add_prep_partition:
+            self._generate_prep_partition(block_device.get_name())
+
     def _get_ptable_type(self, partition_table):
         """Return the value for the "ptable" entry in the physical operation.
         """
@@ -207,12 +239,38 @@
                 "Unknown partition table type: %s" % (
                     partition_table.table_type))
 
+    def _generate_prep_partition(self, device_name):
+        """Generate the prep partition at the beginning of the block device."""
+        prep_part_name = "%s-part1" % (device_name)
+        partition_operation = {
+            "id": prep_part_name,
+            "name": prep_part_name,
+            "type": "partition",
+            "number": 1,
+            "offset": "%dB" % INITIAL_PARTITION_OFFSET,
+            "size": "%dB" % PREP_PARTITION_SIZE,
+            "device": device_name,
+            "wipe": "zero",
+            "flag": "prep",
+            "grub_device": True,
+        }
+        self.storage_config.append(partition_operation)
+
     def _generate_partition_operations(self):
         """Generate all partition operations."""
         for partition in self.operations["partition"]:
-            self._generate_partition_operation(partition)
+            if partition == self.boot_disk_first_partition:
+                # This is the first partition in the boot disk and add prep
+                # partition at the beginning of the partition table.
+                device_name = partition.partition_table.block_device.get_name()
+                self._generate_prep_partition(device_name)
+                self._generate_partition_operation(
+                    partition, include_initial=False)
+            else:
+                self._generate_partition_operation(
+                    partition, include_initial=True)
 
-    def _generate_partition_operation(self, partition):
+    def _generate_partition_operation(self, partition, include_initial):
         """Generate partition operation for `partition` and place in
         `storage_config`."""
         partition_table = partition.partition_table
@@ -229,7 +287,7 @@
             "wipe": "superblock",
         }
         # First partition always sets the initial offset.
-        if partition_number == 1:
+        if partition_number == 1 and include_initial:
             partition_operation["offset"] = "%sB" % INITIAL_PARTITION_OFFSET
         if partition.bootable:
             partition_operation["flag"] = "boot"
 
=== modified file 'src/maasserver/static/js/angular/controllers/node_details_storage.js'
--- src/maasserver/static/js/angular/controllers/node_details_storage.js	2015-11-20 17:36:10 +0000
+++ src/maasserver/static/js/angular/controllers/node_details_storage.js	2016-02-24 16:23:03 +0000
@@ -51,6 +51,7 @@
         var END_OF_PARTITION_TABLE_SPACE = 1024 * 1024;
         var PARTITION_TABLE_EXTRA_SPACE = INITIAL_PARTITION_OFFSET +
             END_OF_PARTITION_TABLE_SPACE;
+        var PREP_PARTITION_SIZE = 8 * 1024 * 1024;
 
         // From models/partition.py - must be kept in sync.
         var PARTITION_ALIGNMENT_SIZE = 4 * 1024 * 1024;
@@ -855,6 +856,11 @@
                 || disk.original.partition_table_type === "") {
                 // Disk has no partition table, so reserve space for it.
                 space_to_reserve = PARTITION_TABLE_EXTRA_SPACE;
+                // ppc64el node requires that space be saved for the prep
+                // partition.
+                if($scope.node.architecture.indexOf("ppc64el") === 0) {
+                    space_to_reserve += PREP_PARTITION_SIZE;
+                }
             }
             return ConverterService.roundByBlockSize(
                 disk.original.available_size - space_to_reserve,
@@ -1130,6 +1136,11 @@
             if(disk.original.partition_table_type === "mbr" &&
                 length > 2) {
                 return disk.name + "-part" + (length + 2);
+            } else if($scope.node.architecture.indexOf("ppc64el") === 0 &&
+                disk.original.is_boot) {
+                // Boot disk on ppc64el machines skip the first partition as
+                // its reserved for the prep partition.
+                return disk.name + "-part" + (length + 2);
             } else {
                 return disk.name + "-part" + (length + 1);
             }
 
=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_node_details_storage.js'
--- src/maasserver/static/js/angular/controllers/tests/test_node_details_storage.js	2015-11-20 17:36:10 +0000
+++ src/maasserver/static/js/angular/controllers/tests/test_node_details_storage.js	2016-02-24 16:23:03 +0000
@@ -101,6 +101,7 @@
     var node, updateNodeSpy, canEditSpy;
     beforeEach(function() {
         node = {
+            architecture: "amd64/generic",
             disks: []
         };
         updateNodeSpy = jasmine.createSpy("updateNode");
@@ -1455,6 +1456,25 @@
                 expect($scope.canAddPartition(disk)).toBe(false);
             });
 
+        it("returns false if available_size is less than partition size " +
+           "when node is ppc64el architecture",
+            function() {
+                var controller = makeController();
+                var disk = {
+                    type: "physical",
+                    fstype: "",
+                    original: {
+                        partition_table_type: null,
+                        available_size: (2.5 * 1024 * 1024) + (8 * 1024 * 1024),
+                        block_size: 1024
+                    }
+                };
+                node.architecture = "ppc64el/generic";
+                spyOn($scope, "isAllStorageDisabled").and.returnValue(false);
+                $scope.isSuperUser = function() { return true; };
+                expect($scope.canAddPartition(disk)).toBe(false);
+            });
+
         it("returns false if not super user", function() {
             var controller = makeController();
             var disk = {
@@ -2350,6 +2370,37 @@
             expect($scope.getAddPartitionName(disk)).toBe(name + "-part3");
         });
 
+        it("returns disk.name with -part2 for ppc64el", function() {
+            node.architecture = "ppc64el/generic";
+            var controller = makeController();
+            var name = makeName("sda");
+            var disk = {
+                name: name,
+                original: {
+                    is_boot: true,
+                    partition_table_type: "gpt"
+                }
+            };
+
+            expect($scope.getAddPartitionName(disk)).toBe(name + "-part2");
+        });
+
+        it("returns disk.name with -part4 for ppc64el", function() {
+            node.architecture = "ppc64el/generic";
+            var controller = makeController();
+            var name = makeName("sda");
+            var disk = {
+                name: name,
+                original: {
+                    is_boot: true,
+                    partition_table_type: "gpt",
+                    partitions: [{}, {}]
+                }
+            };
+
+            expect($scope.getAddPartitionName(disk)).toBe(name + "-part4");
+        });
+
         it("returns disk.name with -part3 for MBR", function() {
             var controller = makeController();
             var name = makeName("sda");
 
=== modified file 'src/maasserver/storage_layouts.py'
--- src/maasserver/storage_layouts.py	2015-10-07 23:07:32 +0000
+++ src/maasserver/storage_layouts.py	2016-02-24 16:23:03 +0000
@@ -178,7 +178,12 @@
         from maasserver.models.partitiontable import PartitionTable
         boot_partition_table = PartitionTable.objects.create(
             block_device=self.boot_disk)
-        if boot_partition_table.table_type == PARTITION_TABLE_TYPE.GPT:
+        bios_boot_method = self.node.get_bios_boot_method()
+        node_arch, _ = self.node.split_arch()
+        if (boot_partition_table.table_type == PARTITION_TABLE_TYPE.GPT and
+                bios_boot_method == "uefi" and node_arch != "ppc64el"):
+            # Add EFI partition only if booting UEFI and not a ppc64el
+            # architecture.
             efi_partition = boot_partition_table.add_partition(
                 size=EFI_PARTITION_SIZE, bootable=True)
             Filesystem.objects.create(
 
=== modified file 'src/maasserver/tests/test_preseed_storage.py'
--- src/maasserver/tests/test_preseed_storage.py	2015-11-17 23:19:51 +0000
+++ src/maasserver/tests/test_preseed_storage.py	2016-02-24 16:23:03 +0000
@@ -28,7 +28,10 @@
     RAID,
     VolumeGroup,
 )
-from maasserver.models.partitiontable import PARTITION_TABLE_EXTRA_SPACE
+from maasserver.models.partitiontable import (
+    PARTITION_TABLE_EXTRA_SPACE,
+    PREP_PARTITION_SIZE,
+)
 from maasserver.preseed_storage import compose_curtin_storage_config
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase
@@ -757,3 +760,214 @@
         node._create_acquired_filesystems()
         config = compose_curtin_storage_config(node)
         self.assertStorageConfig(self.STORAGE_CONFIG, config)
+
+
+class TestSimplePower8Layout(MAASServerTestCase, AssertStorageConfigMixin):
+
+    STORAGE_CONFIG = dedent("""\
+        config:
+          - id: sda
+            name: sda
+            type: disk
+            wipe: superblock
+            ptable: gpt
+            model: QEMU HARDDISK
+            serial: QM00001
+          - id: sda-part1
+            name: sda-part1
+            type: partition
+            number: 1
+            offset: 4194304B
+            size: 8388608B
+            device: sda
+            wipe: zero
+            flag: prep
+            grub_device: True
+          - id: sda-part2
+            name: sda-part2
+            type: partition
+            number: 2
+            uuid: f74ff260-2a5b-4a36-b1b8-37f746b946bf
+            size: 8573157376B
+            wipe: superblock
+            device: sda
+          - id: sda-part2_format
+            type: format
+            fstype: ext4
+            label: root
+            uuid: 90a69b22-e281-4c5b-8df9-b09514f27ba1
+            volume: sda-part2
+          - id: sda-part2_mount
+            type: mount
+            path: /
+            device: sda-part2_format
+        """)
+
+    def test__renders_expected_output(self):
+        node = factory.make_Node(
+            status=NODE_STATUS.ALLOCATED, architecture="ppc64el/generic",
+            bios_boot_method="uefi", with_boot_disk=False)
+        boot_disk = factory.make_PhysicalBlockDevice(
+            node=node, size=8 * 1024 ** 3, name="sda",
+            model="QEMU HARDDISK", serial="QM00001")  # 8 GiB
+        partition_table = factory.make_PartitionTable(
+            table_type=PARTITION_TABLE_TYPE.GPT, block_device=boot_disk)
+        root_partition = factory.make_Partition(
+            partition_table=partition_table,
+            uuid="f74ff260-2a5b-4a36-b1b8-37f746b946bf",
+            size=(
+                (8 * 1024 ** 3) - PARTITION_TABLE_EXTRA_SPACE -
+                PREP_PARTITION_SIZE),
+            bootable=False)
+        factory.make_Filesystem(
+            partition=root_partition, fstype=FILESYSTEM_TYPE.EXT4,
+            uuid="90a69b22-e281-4c5b-8df9-b09514f27ba1", label="root",
+            mount_point="/")
+        node._create_acquired_filesystems()
+        config = compose_curtin_storage_config(node)
+        self.assertStorageConfig(self.STORAGE_CONFIG, config)
+
+
+class TestPower8ExtraSpaceLayout(
+        MAASServerTestCase, AssertStorageConfigMixin):
+
+    STORAGE_CONFIG = dedent("""\
+        config:
+          - id: sda
+            name: sda
+            type: disk
+            wipe: superblock
+            ptable: gpt
+            model: QEMU HARDDISK
+            serial: QM00001
+          - id: sda-part1
+            name: sda-part1
+            type: partition
+            number: 1
+            offset: 4194304B
+            size: 8388608B
+            device: sda
+            wipe: zero
+            flag: prep
+            grub_device: True
+          - id: sda-part2
+            name: sda-part2
+            type: partition
+            number: 2
+            uuid: f74ff260-2a5b-4a36-b1b8-37f746b946bf
+            size: 7507804160B
+            wipe: superblock
+            device: sda
+          - id: sda-part2_format
+            type: format
+            fstype: ext4
+            label: root
+            uuid: 90a69b22-e281-4c5b-8df9-b09514f27ba1
+            volume: sda-part2
+          - id: sda-part2_mount
+            type: mount
+            path: /
+            device: sda-part2_format
+        """)
+
+    def test__renders_expected_output(self):
+        node = factory.make_Node(
+            status=NODE_STATUS.ALLOCATED, architecture="ppc64el/generic",
+            bios_boot_method="uefi", with_boot_disk=False)
+        boot_disk = factory.make_PhysicalBlockDevice(
+            node=node, size=8 * 1024 ** 3, name="sda",
+            model="QEMU HARDDISK", serial="QM00001")  # 8 GiB
+        partition_table = factory.make_PartitionTable(
+            table_type=PARTITION_TABLE_TYPE.GPT, block_device=boot_disk)
+        root_partition = factory.make_Partition(
+            partition_table=partition_table,
+            uuid="f74ff260-2a5b-4a36-b1b8-37f746b946bf",
+            size=(7 * 1024 ** 3) - PARTITION_TABLE_EXTRA_SPACE,
+            bootable=False)
+        factory.make_Filesystem(
+            partition=root_partition, fstype=FILESYSTEM_TYPE.EXT4,
+            uuid="90a69b22-e281-4c5b-8df9-b09514f27ba1", label="root",
+            mount_point="/")
+        node._create_acquired_filesystems()
+        config = compose_curtin_storage_config(node)
+        self.assertStorageConfig(self.STORAGE_CONFIG, config)
+
+
+class TestPower8NoPartitionTableLayout(
+        MAASServerTestCase, AssertStorageConfigMixin):
+
+    STORAGE_CONFIG = dedent("""\
+        config:
+          - id: sda
+            name: sda
+            type: disk
+            wipe: superblock
+            ptable: gpt
+            model: QEMU HARDDISK
+            serial: QM00001
+          - id: sdb
+            name: sdb
+            type: disk
+            wipe: superblock
+            ptable: gpt
+            model: QEMU HARDDISK
+            serial: QM00002
+          - id: sdb-part1
+            name: sdb-part1
+            type: partition
+            number: 1
+            offset: 4194304B
+            size: 8388608B
+            device: sdb
+            wipe: zero
+            flag: prep
+            grub_device: True
+          - id: sda-part1
+            name: sda-part1
+            type: partition
+            number: 1
+            uuid: f74ff260-2a5b-4a36-b1b8-37f746b946bf
+            offset: 4194304B
+            size: 8573157376B
+            wipe: superblock
+            device: sda
+          - id: sda-part1_format
+            type: format
+            fstype: ext4
+            label: root
+            uuid: 90a69b22-e281-4c5b-8df9-b09514f27ba1
+            volume: sda-part1
+          - id: sda-part1_mount
+            type: mount
+            path: /
+            device: sda-part1_format
+        """)
+
+    def test__renders_expected_output(self):
+        node = factory.make_Node(
+            status=NODE_STATUS.ALLOCATED, architecture="ppc64el/generic",
+            bios_boot_method="uefi", with_boot_disk=False)
+        root_disk = factory.make_PhysicalBlockDevice(
+            node=node, size=8 * 1024 ** 3, name="sda",
+            model="QEMU HARDDISK", serial="QM00001")  # 8 GiB
+        partition_table = factory.make_PartitionTable(
+            table_type=PARTITION_TABLE_TYPE.GPT, block_device=root_disk)
+        boot_disk = factory.make_PhysicalBlockDevice(
+            node=node, size=8 * 1024 ** 3, name="sdb",
+            model="QEMU HARDDISK", serial="QM00002")  # 8 GiB
+        node.boot_disk = boot_disk
+        node.save()
+        root_partition = factory.make_Partition(
+            partition_table=partition_table,
+            uuid="f74ff260-2a5b-4a36-b1b8-37f746b946bf",
+            size=(
+                (8 * 1024 ** 3) - PARTITION_TABLE_EXTRA_SPACE -
+                PREP_PARTITION_SIZE),
+            bootable=False)
+        factory.make_Filesystem(
+            partition=root_partition, fstype=FILESYSTEM_TYPE.EXT4,
+            uuid="90a69b22-e281-4c5b-8df9-b09514f27ba1", label="root",
+            mount_point="/")
+        node._create_acquired_filesystems()
+        config = compose_curtin_storage_config(node)
+        self.assertStorageConfig(self.STORAGE_CONFIG, config)
 
=== modified file 'src/maasserver/tests/test_storage_layouts.py'
--- src/maasserver/tests/test_storage_layouts.py	2015-11-17 23:19:51 +0000
+++ src/maasserver/tests/test_storage_layouts.py	2016-02-24 16:23:03 +0000
@@ -29,7 +29,10 @@
     MAX_PARTITION_SIZE_FOR_MBR,
     PARTITION_ALIGNMENT_SIZE,
 )
-from maasserver.models.partitiontable import PARTITION_TABLE_EXTRA_SPACE
+from maasserver.models.partitiontable import (
+    PARTITION_TABLE_EXTRA_SPACE,
+    PREP_PARTITION_SIZE,
+)
 from maasserver.storage_layouts import (
     BcacheStorageLayout,
     BcacheStorageLayoutBase,
@@ -63,6 +66,20 @@
     return factory.make_Node(*args, **kwargs)
 
 
+def make_ppc64el_Node_with_powernv_boot_method(*args, **kwargs):
+    kwargs['bios_boot_method'] = "powernv"
+    kwargs['with_boot_disk'] = False
+    kwargs['architecture'] = "ppc64el/generic"
+    return factory.make_Node(*args, **kwargs)
+
+
+def make_ppc64el_Node_with_uefi_boot_method(*args, **kwargs):
+    kwargs['bios_boot_method'] = "powerkvm"
+    kwargs['with_boot_disk'] = False
+    kwargs['architecture'] = "ppc64el/generic"
+    return factory.make_Node(*args, **kwargs)
+
+
 class TestFormHelpers(MAASServerTestCase):
 
     def test_get_storage_layout_choices(self):
@@ -514,6 +531,66 @@
                 mount_point="/",
                 ))
 
+    def test__creates_layout_for_powernv(self):
+        node = make_ppc64el_Node_with_powernv_boot_method()
+        boot_disk = factory.make_PhysicalBlockDevice(
+            node=node, size=LARGE_BLOCK_DEVICE)
+        layout = FlatStorageLayout(node)
+        layout.configure()
+
+        # Validate partition table.
+        partition_table = boot_disk.get_partitiontable()
+        self.assertEqual(PARTITION_TABLE_TYPE.GPT, partition_table.table_type)
+
+        # Validate root partition.
+        partitions = partition_table.partitions.order_by('id').all()
+        root_partition = partitions[0]
+        self.assertIsNotNone(root_partition)
+        self.assertEqual(
+            round_size_to_nearest_block(
+                boot_disk.size - PARTITION_TABLE_EXTRA_SPACE -
+                PREP_PARTITION_SIZE,
+                PARTITION_ALIGNMENT_SIZE,
+                False),
+            root_partition.size)
+        self.assertThat(
+            root_partition.get_effective_filesystem(),
+            MatchesStructure.byEquality(
+                fstype=FILESYSTEM_TYPE.EXT4,
+                label="root",
+                mount_point="/",
+                ))
+
+    def test__creates_layout_for_powerkvm(self):
+        node = make_ppc64el_Node_with_uefi_boot_method()
+        boot_disk = factory.make_PhysicalBlockDevice(
+            node=node, size=LARGE_BLOCK_DEVICE)
+        layout = FlatStorageLayout(node)
+        layout.configure()
+
+        # Validate partition table.
+        partition_table = boot_disk.get_partitiontable()
+        self.assertEqual(PARTITION_TABLE_TYPE.GPT, partition_table.table_type)
+
+        # Validate root partition.
+        partitions = partition_table.partitions.order_by('id').all()
+        root_partition = partitions[0]
+        self.assertIsNotNone(root_partition)
+        self.assertEqual(
+            round_size_to_nearest_block(
+                boot_disk.size - PARTITION_TABLE_EXTRA_SPACE -
+                PREP_PARTITION_SIZE,
+                PARTITION_ALIGNMENT_SIZE,
+                False),
+            root_partition.size)
+        self.assertThat(
+            root_partition.get_effective_filesystem(),
+            MatchesStructure.byEquality(
+                fstype=FILESYSTEM_TYPE.EXT4,
+                label="root",
+                mount_point="/",
+                ))
+
     def test__creates_layout_with_uefi_defaults(self):
         node = make_Node_with_uefi_boot_method()
         boot_disk = factory.make_PhysicalBlockDevice(
 
=== modified file 'src/provisioningserver/boot/powerkvm.py'
--- src/provisioningserver/boot/powerkvm.py	2015-10-29 16:19:48 +0000
+++ src/provisioningserver/boot/powerkvm.py	2016-02-24 16:23:03 +0000
@@ -41,7 +41,7 @@
 class PowerKVMBootMethod(BootMethod):
 
     name = "powerkvm"
-    bios_boot_method = "pxe"
+    bios_boot_method = "powerkvm"
     template_subdir = None
     bootloader_path = "bootppc64.bin"
     bootloader_arches = ['ppc64el']
 
=== modified file 'src/provisioningserver/boot/powernv.py'
--- src/provisioningserver/boot/powernv.py	2015-08-14 13:48:59 +0000
+++ src/provisioningserver/boot/powernv.py	2016-02-24 16:23:03 +0000
@@ -68,7 +68,7 @@
 class PowerNVBootMethod(BootMethod):
 
     name = "powernv"
-    bios_boot_method = "pxe"
+    bios_boot_method = "powernv"
     template_subdir = "pxe"
     bootloader_path = "pxelinux.0"
     arch_octet = "00:0E"