etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.17' into 4.18

This commit is contained in:
Daan Hoogland 2023-03-29 17:36:55 +02:00
parent 17b8631615 9fb20056d5
commit 16694d8bec
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java
View File

@ -1642,11 +1642,11 @@ StateListener<State, VirtualMachine.Event, VirtualMachine>, Configurable {
// for each volume find list of suitable storage pools by calling the
// allocators
Set<Long> originalAvoidPoolSet = avoid.getPoolsToAvoid();
if (originalAvoidPoolSet == null) {
originalAvoidPoolSet = new HashSet<Long>();
Set<Long> originalAvoidPoolSet = new HashSet<>();
if (avoid.getPoolsToAvoid() != null) {
originalAvoidPoolSet.addAll(avoid.getPoolsToAvoid());
}
Set<Long> poolsToAvoidOutput = new HashSet<Long>(originalAvoidPoolSet);
Set<Long> poolsToAvoidOutput = new HashSet<>(originalAvoidPoolSet);
for (VolumeVO toBeCreated : volumesTobeCreated) {
s_logger.debug("Checking suitable pools for volume (Id, Type): (" + toBeCreated.getId() + "," + toBeCreated.getVolumeType().name() + ")");
@ -1723,12 +1723,6 @@ StateListener<State, VirtualMachine.Event, VirtualMachine>, Configurable {
DiskOfferingVO diskOffering = _diskOfferingDao.findById(toBeCreated.getDiskOfferingId());
//FR123 check how is it different for service offering getTagsArray and disk offering's
//if ((vmProfile.getTemplate().getFormat() == Storage.ImageFormat.ISO || toBeCreated.getVolumeType() == Volume.Type.ROOT)
// && vmProfile.getServiceOffering().getTagsArray().length != 0) {
// diskOffering.setTagsArray(Arrays.asList(vmProfile.getServiceOffering().getTagsArray()));
//}
DiskProfile diskProfile = new DiskProfile(toBeCreated, diskOffering, vmProfile.getHypervisorType());
boolean useLocalStorage = false;
if (vmProfile.getType() != VirtualMachine.Type.User) {

2
ui/src/views/compute/DeployVM.vue
View File

@ -1844,7 +1844,7 @@ export default {
this.form.networkids = ids
},
updateDefaultNetworks (id) {
this.defaultNetwork = id
this.defaultnetworkid = id
this.form.defaultnetworkid = id
},
updateNetworkConfig (networks) {