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

Proposed by Blake Rouse
Status: Merged
Approved by: Blake Rouse
Approved revision: no longer in the source branch.
Merged at revision: 4519
Proposed branch: lp:~blake-rouse/maas/fix-1522225-1.9
Merge into: lp:maas/1.9
Diff against target: 54 lines (+8/-6)
1 file modified
src/maasserver/models/migrations/create_default_storage_layout.py (+8/-6)
To merge this branch: bzr merge lp:~blake-rouse/maas/fix-1522225-1.9
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
Review via email: mp+279386@code.launchpad.net

Commit message

Fix missing uuid on 181 migration.

To post a comment you must log in.
Revision history for this message
Blake Rouse (blake-rouse) wrote :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/models/migrations/create_default_storage_layout.py'
2--- src/maasserver/models/migrations/create_default_storage_layout.py 2015-12-01 22:08:32 +0000
3+++ src/maasserver/models/migrations/create_default_storage_layout.py 2015-12-03 03:03:33 +0000
4@@ -31,6 +31,7 @@
5 ]
6
7 from datetime import datetime
8+from uuid import uuid4
9
10 from maasserver.enum import (
11 FILESYSTEM_GROUP_TYPE,
12@@ -90,7 +91,7 @@
13 total_size += partition_size
14 root_partition = Partition.objects.create(
15 partition_table=partition_table, size=partition_size, bootable=True,
16- created=now, updated=now)
17+ created=now, updated=now, uuid=uuid4())
18
19 # Add the extra partitions if there is more space.
20 partitions = [root_partition]
21@@ -102,27 +103,28 @@
22 partitions.append(
23 Partition.objects.create(
24 partition_table=partition_table, size=size, bootable=False,
25- created=now, updated=now))
26+ created=now, updated=now, uuid=uuid4()))
27 available_size -= size
28 total_size += size
29
30 # Create the volume group and logical volume.
31 volume_group = FilesystemGroup.objects.create(
32 name="vgroot", group_type=FILESYSTEM_GROUP_TYPE.LVM_VG,
33- created=now, updated=now)
34+ created=now, updated=now, uuid=uuid4())
35 for partition in partitions:
36 Filesystem.objects.create(
37- fstype=FILESYSTEM_TYPE.LVM_PV, partition=partition,
38+ fstype=FILESYSTEM_TYPE.LVM_PV, partition=partition, uuid=uuid4(),
39 filesystem_group=volume_group, created=now, updated=now)
40 number_of_extents, _ = divmod(total_size, LVM_PE_SIZE)
41 lv_size = (number_of_extents - len(partitions)) * LVM_PE_SIZE
42 logical_volume = VirtualBlockDevice.objects.create(
43 node=node, name="lvroot", size=lv_size, block_size=4096,
44- filesystem_group=volume_group, created=now, updated=now)
45+ filesystem_group=volume_group, created=now, updated=now, uuid=uuid4())
46 Filesystem.objects.create(
47 block_device=logical_volume,
48 fstype=FILESYSTEM_TYPE.EXT4,
49 label="root",
50 mount_point="/",
51 created=now,
52- updated=now)
53+ updated=now,
54+ uuid=uuid4())

Subscribers

People subscribed via source and target branches