Merge branch 'ZSTAC-25847@@2' into 'master'

gitlab · gitlab · commit f4f418bfbe1f · 2020-03-03T19:02:11.000+08:00
[BugFix: ZSTACK-25936]

See merge request zstackio/zstack!5934
diff --git a/compute/src/main/java/org/zstack/compute/vm/VmInstanceBase.java b/compute/src/main/java/org/zstack/compute/vm/VmInstanceBase.java
@@ -5782,6 +5782,7 @@ public String call(VmNicInventory arg) {
         selectBootOrder(spec);
         spec.setConsolePassword(VmSystemTags.CONSOLE_PASSWORD.
                 getTokenByResourceUuid(self.getUuid(), VmSystemTags.CONSOLE_PASSWORD_TOKEN));
+        spec.setVDIMonitorNumber(VmSystemTags.VDI_MONITOR_NUMBER.getTokenByResourceUuid(self.getUuid(), VmSystemTags.VDI_MONITOR_NUMBER_TOKEN));
         return spec;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -5782,6 +5782,7 @@ public String call(VmNicInventory arg) {`
`5782`	`5782`	`selectBootOrder(spec);`
`5783`	`5783`	`spec.setConsolePassword(VmSystemTags.CONSOLE_PASSWORD.`
`5784`	`5784`	`getTokenByResourceUuid(self.getUuid(), VmSystemTags.CONSOLE_PASSWORD_TOKEN));`
	`5785`	`+ spec.setVDIMonitorNumber(VmSystemTags.VDI_MONITOR_NUMBER.getTokenByResourceUuid(self.getUuid(), VmSystemTags.VDI_MONITOR_NUMBER_TOKEN));`
`5785`	`5786`	`return spec;`
`5786`	`5787`	`}`
`5787`	`5788`