[cloudstack] branch 4.17 updated: Fix deploy from ISO with custom disk offering (#6441)

[nvazquez]

This is an automated email from the ASF dual-hosted git repository.

nvazquez pushed a commit to branch 4.17
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.17 by this push:
     new cb7cbeca25 Fix deploy from ISO with custom disk offering (#6441)
cb7cbeca25 is described below

commit cb7cbeca259e794b5d6fa9577b6f9408b389ee66
Author: Nicolas Vazquez <nicovazque...@gmail.com>
AuthorDate: Wed Jun 8 08:30:08 2022 -0300

    Fix deploy from ISO with custom disk offering (#6441)
---
 server/src/main/java/com/cloud/vm/UserVmManagerImpl.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java 
b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
index 9e3622886e..384a3a03a0 100644
--- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -3840,6 +3840,9 @@ public class UserVmManagerImpl extends ManagerBase 
implements UserVmManager, Vir
                 rootDiskOfferingId = diskOfferingId;
                 diskOfferingId = null;
             }
+            if 
(!customParameters.containsKey(VmDetailConstants.ROOT_DISK_SIZE)) {
+                customParameters.put(VmDetailConstants.ROOT_DISK_SIZE, 
String.valueOf(diskSize));
+            }
         }
         if (!offering.getDiskOfferingStrictness() && overrideDiskOfferingId != 
null) {
             rootDiskOfferingId = overrideDiskOfferingId;