Skip to content

Commit 4d501e5

Browse files
authored
Merge pull request #7685 from GuoLiBin6/automated-cherry-pick-of-#7681-upstream-release-3.9
Automated cherry pick of #7681: feat: 重启重置磁盘功能只限制在kvm
2 parents 5f2d5e7 + 3b32999 commit 4d501e5

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

containers/Compute/views/vminstance/create/form/IDC.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
:storageHostParams="storageHostParams"
107107
:domain="project_domain"
108108
:isStorageShow="isStorageShow"
109-
isAutoResetShow
109+
:isAutoResetShow="isKvm"
110110
@storageHostChange="storageHostChange" />
111111
</a-form-item>
112112
<a-form-item :label="$t('compute.text_50')">
@@ -129,7 +129,7 @@
129129
:enableMointpoint="true"
130130
:storageParams="dataDiskStorageParams"
131131
:storageHostParams="storageHostParams"
132-
isAutoResetShow
132+
:isAutoResetShow="isKvm"
133133
@storageHostChange="storageHostChange" />
134134
<div slot="extra" class="warning-color" v-if="isStorageShow">{{ $t('compute.select_storage_no_schetag') }}</div>
135135
</a-form-item>

containers/Compute/views/vminstance/create/form/Private.vue

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,7 @@
9191
:sku="form.fd.sku"
9292
:capability-data="form.fi.capability"
9393
:image="form.fi.imageMsg"
94-
:sizeDisabled="disabledSysDiskSize"
95-
isAutoResetShow />
94+
:sizeDisabled="disabledSysDiskSize" />
9695
</a-form-item>
9796
<a-form-item :label="$t('compute.text_50')">
9897
<data-disk
@@ -104,8 +103,7 @@
104103
:sku="form.fd.sku"
105104
:defaultType="form.fd.systemDiskType"
106105
:capability-data="form.fi.capability"
107-
ref="dataDiskRef"
108-
isAutoResetShow />
106+
ref="dataDiskRef" />
109107
</a-form-item>
110108
<a-form-item :label="$t('compute.text_1372')" v-if="showServerAccount">
111109
<server-account :form="form" :hypervisor="form.fd.hypervisor" :instance_capabilities="form.fi.capability.instance_capabilities" :osType="osType" />

containers/Compute/views/vminstance/create/form/Public.vue

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,7 @@
106106
:hypervisor="hypervisor"
107107
:sku="form.fd.sku"
108108
:capability-data="form.fi.capability"
109-
:image="form.fi.imageMsg"
110-
isAutoResetShow />
109+
:image="form.fi.imageMsg" />
111110
</a-form-item>
112111
<a-form-item :label="$t('compute.text_50')">
113112
<data-disk
@@ -119,8 +118,7 @@
119118
:sku="form.fd.sku"
120119
:defaultType="form.fd.systemDiskType"
121120
:capability-data="form.fi.capability"
122-
ref="dataDiskRef"
123-
isAutoResetShow />
121+
ref="dataDiskRef" />
124122
<server-network
125123
:form="form"
126124
:decorator="decorators.network"

0 commit comments

Comments
 (0)