MAAS

Merge ~newell-jensen/maas:2.3-fix-rsd-number into maas:2.3

  1. Git
  2. lp:~newell-jensen/maas
  3. 2.3-fix-rsd-number
  4. Merge into 2.3
Proposed by Newell Jensen
Status: Merged
Approved by: Newell Jensen
Approved revision: 5ca688a5e24d30c546f90d9227b8ec0c1fe8f04b
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~newell-jensen/maas:2.3-fix-rsd-number
Merge into: maas:2.3
Diff against target: 13 lines (+1/-1)
1 file modified
src/provisioningserver/drivers/pod/rsd.py (+1/-1)
Reviewer Review Type Date Requested Status
Newell Jensen (community) Approve
Review via email: mp+341024@code.launchpad.net

Commit message

Backport 476dcf44f1370625d5c5637d3b459cdd6511db0c

Convert number to exponential representation in RSD Pod driver.

To post a comment you must log in.
Revision history for this message
Newell Jensen (newell-jensen) wrote :

Self approved backport

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/provisioningserver/drivers/pod/rsd.py b/src/provisioningserver/drivers/pod/rsd.py
2index 6ad7a8a..97c1764 100644
3--- a/src/provisioningserver/drivers/pod/rsd.py
4+++ b/src/provisioningserver/drivers/pod/rsd.py
5@@ -428,7 +428,7 @@ class RSDPodDriver(PodDriver):
6 discovered_pod.cores += sum(cores)
7 discovered_pod.cpu_speeds.extend(cpu_speeds)
8 # GiB to Bytes.
9- discovered_pod.local_storage += sum(storages) * 1073741824
10+ discovered_pod.local_storage += sum(storages) * (1024 ** 3)
11 discovered_pod.local_disks += len(storages)
12
13 # Set cpu_speed to max of all found cpu_speeds.

Subscribers

People subscribed via source and target branches