apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.19' into 4.20

Browse Source
This commit is contained in:
Daan Hoogland 2025-05-01 09:36:14 +02:00
commit 01d87b7747
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/lib/cloudutils/networkConfig.py
View File

@ -41,7 +41,7 @@ class networkConfig:
return devs return devs
@staticmethod @staticmethod
def getDefaultNetwork(): def getDefaultNetwork():
cmd = bash("route -n|awk \'/^0.0.0.0/ {print $2,$8}\'") cmd = bash("ip route show default | awk \'{print $3,$5}\'")
if not cmd.isSuccess(): if not cmd.isSuccess():
logging.debug("Failed to get default route") logging.debug("Failed to get default route")
raise CloudRuntimeException("Failed to get default route") raise CloudRuntimeException("Failed to get default route")

1
ui/src/views/compute/EditVM.vue
View File

@ -185,7 +185,6 @@ export default {
isdynamicallyscalable: this.resource.isdynamicallyscalable, isdynamicallyscalable: this.resource.isdynamicallyscalable,
deleteprotection: this.resource.deleteprotection, deleteprotection: this.resource.deleteprotection,
group: this.resource.group, group: this.resource.group,
securitygroupids: this.resource.securitygroup.map(x => x.id),
userdata: '', userdata: '',
haenable: this.resource.haenable haenable: this.resource.haenable
}) })

9
ui/src/views/image/RegisterOrUploadIso.vue
View File

@ -88,6 +88,15 @@
<a-switch v-model:checked="form.directdownload"/> <a-switch v-model:checked="form.directdownload"/>
</a-form-item> </a-form-item>
<a-form-item ref="checksum" name="checksum">
<template #label>
<tooltip-label :title="$t('label.checksum')" :tooltip="apiParams.checksum.description"/>
</template>
<a-input
v-model:value="form.checksum"
:placeholder="apiParams.checksum.description" />
</a-form-item>
<a-form-item ref="zoneid" name="zoneid"> <a-form-item ref="zoneid" name="zoneid">
<template #label> <template #label>
<tooltip-label :title="$t('label.zoneid')" :tooltip="apiParams.zoneid.description"/> <tooltip-label :title="$t('label.zoneid')" :tooltip="apiParams.zoneid.description"/>

6
ui/src/views/image/RegisterOrUploadTemplate.vue
View File

@ -214,8 +214,8 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="12" v-if="(hyperKVMShow || hyperCustomShow) && currentForm === 'Create'"> <a-row :gutter="12">
<a-col :md="24" :lg="12"> <a-col :md="24" :lg="12" v-if="(hyperKVMShow || hyperCustomShow) && currentForm === 'Create'">
<a-form-item ref="directdownload" name="directdownload"> <a-form-item ref="directdownload" name="directdownload">
<template #label> <template #label>
<tooltip-label :title="$t('label.directdownload')" :tooltip="apiParams.directdownload.description"/> <tooltip-label :title="$t('label.directdownload')" :tooltip="apiParams.directdownload.description"/>
@ -223,7 +223,7 @@
<a-switch v-model:checked="form.directdownload" @change="handleChangeDirect" /> <a-switch v-model:checked="form.directdownload" @change="handleChangeDirect" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="24" :lg="12" v-if="allowDirectDownload"> <a-col :md="24" :lg="12">
<a-form-item ref="checksum" name="checksum"> <a-form-item ref="checksum" name="checksum">
<template #label> <template #label>
<tooltip-label :title="$t('label.checksum')" :tooltip="apiParams.checksum.description"/> <tooltip-label :title="$t('label.checksum')" :tooltip="apiParams.checksum.description"/>