Skip to content

Commit

Permalink
Merge pull request GoogleCloudPlatform#2211 from florinpapa:boot_disk…
Browse files Browse the repository at this point in the history
…_size

PiperOrigin-RevId: 307847845
  • Loading branch information
copybara-github committed Apr 22, 2020
2 parents 89c9faf + 4532f88 commit 507bacd
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGES.next.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,4 @@
- Update PKB cloud datastore ycsb benchmark:
- change private_keyfile_dir from a constant value to a FLAG
- delete all db entries as part of Cleanup
- Remove 'default' keyword from AWS and Azure boot_disk_size
2 changes: 1 addition & 1 deletion perfkitbenchmarker/providers/aws/aws_virtual_machine.py
Original file line number Diff line number Diff line change
Expand Up @@ -1009,7 +1009,7 @@ def GetResourceMetadata(self):
"""
result = super(AwsVirtualMachine, self).GetResourceMetadata()
result['boot_disk_type'] = self.DEFAULT_ROOT_DISK_TYPE
result['boot_disk_size'] = self.boot_disk_size or 'default'
result['boot_disk_size'] = self.boot_disk_size
if self.use_dedicated_host:
result['num_vms_per_host'] = self.num_vms_per_host
result['efa'] = FLAGS.aws_efa
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,7 @@ def GetResourceMetadata(self):
result = super(AzureVirtualMachine, self).GetResourceMetadata()
result['accelerated_networking'] = self.nic.accelerated_networking
result['boot_disk_type'] = self.os_disk.disk_type
result['boot_disk_size'] = self.os_disk.disk_size or 'default'
result['boot_disk_size'] = self.os_disk.disk_size
if self.network.placement_group:
result['placement_group_strategy'] = self.network.placement_group.strategy
else:
Expand Down

0 comments on commit 507bacd

Please sign in to comment.