Skip to content

[Mold] Glue 이미지를 이용한 가상머신 생성 오류로 스택 소스 임시 주석처리 #590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jschoiRR merged 16 commits into from
Jan 21, 2025
Merged

[Mold] Glue 이미지를 이용한 가상머신 생성 오류로 스택 소스 임시 주석처리 #590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ca8acb1
Merge pull request #319 from ablecloud-team/ablestack-diplo
Dajeong-Park Jan 14, 2025
d3647fc
Update UserVmManagerImpl.java
Dajeong-Park Jan 14, 2025
0199af2
Update UserVmManagerImpl.java
Dajeong-Park Jan 14, 2025
680ff56
Update SnapshotObject.java
Dajeong-Park Jan 14, 2025
e7281ac
Update VolumeObject.java
Dajeong-Park Jan 14, 2025
c43f3f2
Update DesktopClusterResourceModifierActionWorker.java
Dajeong-Park Jan 14, 2025
3addec4
Update AutomationControllerActionWorker.java
Dajeong-Park Jan 14, 2025
667b498
Update AutomationControllerResourceModifierActionWorker.java
Dajeong-Park Jan 14, 2025
9789fc0
Update AblestackPrimaryDataStoreLifeCycleImpl.java
Dajeong-Park Jan 14, 2025
d84f75b
Update UserVmManagerImpl.java
Dajeong-Park Jan 14, 2025
31007da
Update UserVmManagerImpl.java
Dajeong-Park Jan 14, 2025
2dd63f8
Merge pull request #320 from ablecloud-team/ablestack-diplo
Dajeong-Park Jan 14, 2025
919b508
Merge pull request #321 from ablecloud-team/ablestack-diplo
Dajeong-Park Jan 16, 2025
59d64ab
Update SecondaryStorageManagerImpl.java
Dajeong-Park Jan 16, 2025
d5c751b
Glue 이미지로 가상머신 생성 오류 수정
Dajeong-Park Jan 17, 2025
1713c79
Update UserVmManagerImpl.java
Dajeong-Park Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,6 @@
import com.cloud.storage.StoragePoolStatus;
import com.cloud.storage.VMTemplateStorageResourceAssoc;
import com.cloud.storage.VMTemplateVO;
import com.cloud.storage.VMTemplateZoneVO;
import com.cloud.storage.Volume;
import com.cloud.storage.VolumeApiService;
import com.cloud.storage.VolumeVO;
Expand Down Expand Up @@ -4413,10 +4412,12 @@ private UserVm getUncheckedUserVmResource(DataCenter zone, String hostName, Stri
if (template.getTemplateType().equals(TemplateType.SYSTEM) && !CKS_NODE.equals(vmType) && !SHAREDFSVM.equals(vmType)) {
throw new InvalidParameterValueException(String.format("Unable to use system template %s to deploy a user vm", template));
}
List<VMTemplateZoneVO> listZoneTemplate = _templateZoneDao.listByZoneTemplate(zone.getId(), template.getId());
if (listZoneTemplate == null || listZoneTemplate.isEmpty()) {
throw new InvalidParameterValueException(String.format("The template %s is not available for use", template));
}

// apache#9873 ) kvm-default-vm-import-dummy-template 을 이용한 가상머신 생성을 위해 임시 주석처리
// List<VMTemplateZoneVO> listZoneTemplate = _templateZoneDao.listByZoneTemplate(zone.getId(), template.getId());
// if (listZoneTemplate == null || listZoneTemplate.isEmpty()) {
// throw new InvalidParameterValueException(String.format("The template %s is not available for use", template));
// }

if (isIso && !template.isBootable()) {
throw new InvalidParameterValueException(String.format("Installing from ISO requires an ISO that is bootable: %s", template));
Expand Down
4 changes: 2 additions & 2 deletions ...ler/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,11 +402,11 @@ private List<String> getAllowedInternalSiteCidrs() {
for (String cidr : cidrs) {
if (NetUtils.isValidIp4Cidr(cidr) && !cidr.startsWith("0.0.0.0")) {
if (! NetUtils.getCleanIp4Cidr(cidr).equals(cidr)) {
s_logger.warn(String.format("Invalid CIDR %s in %s", cidr, SecStorageAllowedInternalDownloadSites.key()));
logger.warn(String.format("Invalid CIDR %s in %s", cidr, SecStorageAllowedInternalDownloadSites.key()));
}
allowedCidrs.add(NetUtils.getCleanIp4Cidr(cidr));
} else if (NetUtils.isValidIp4(cidr) && !cidr.startsWith("0.0.0.0")) {
s_logger.warn(String.format("Ip address is not a valid CIDR; %s consider using %s/32", cidr, cidr));
logger.warn(String.format("Ip address is not a valid CIDR; %s consider using %s/32", cidr, cidr));
allowedCidrs.add(cidr);
}
}
Expand Down
Loading