Merge pull request #6717 from easy-mj/feature/mj-r-master-vm

feat: 调整主机模版逻辑控制
yunionio · Jun 18, 2024 · 06c0edb · 06c0edb
2 parents 6fe5e1a + d0b0a79
commit 06c0edb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/containers/Compute/views/vminstance/create/components/SystemDisk.vue b/containers/Compute/views/vminstance/create/components/SystemDisk.vue
@@ -151,7 +151,7 @@ export default {
     },
     elements () {
       const ret = ['disk-select']
-      if (this.isIDC && !this.isServertemplate) {
+      if (this.isIDC) {
         ret.push('schedtag')
         if (this.form.fd.hypervisor === HYPERVISORS_MAP.esxi.key || this.form.fd.hypervisor === HYPERVISORS_MAP.kvm.key) {
           ret.push('storage') // vmware,kvm 支持指定块存储
@@ -162,7 +162,7 @@ export default {
         //   ret.push('schedtag')
         // }
       }
-      if (this.isAws && !this.isServertemplate) {
+      if (this.isAws) {
         if (this.currentTypeObj?.key === 'gp3') {
           ret.push('iops', 'throughput')
         }
@@ -174,7 +174,7 @@ export default {
     },
     iopsLimit () {
       let ret = { min: 0 }
-      if (this.isAws && !this.isServertemplate) {
+      if (this.isAws) {
         // gp3 iops 不能超过磁盘500倍
         if (this.currentTypeObj?.key === 'gp3') {
           ret = { min: 3000, max: 16000 }

diff --git a/containers/Compute/views/vminstance/create/form/IDC.vue b/containers/Compute/views/vminstance/create/form/IDC.vue
@@ -196,7 +196,7 @@
               :hypervisor="form.fd.hypervisor"
               :showSecgroupBind="showSecgroupBind" />
           </a-form-item>
-          <a-form-item v-show="!isServertemplate" :label="$t('compute.text_311')" class="mb-0">
+          <a-form-item :label="$t('compute.text_311')" class="mb-0">
             <sched-policy
               :form="form"
               :server-type="form.fi.createType"