mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-25 17:22:33 +02:00
UI: Fix primary storage for datastore cluster and retain traffic labels during zone deployment (#11760)
This commit is contained in:
parent
270d3f9a2d
commit
9f20979bce
@ -396,7 +396,7 @@ export default {
|
||||
placeHolder: 'message.error.server',
|
||||
required: true,
|
||||
display: {
|
||||
primaryStorageProtocol: ['nfs', 'iscsi', 'gluster', 'SMB', 'Linstor']
|
||||
primaryStorageProtocol: ['nfs', 'iscsi', 'gluster', 'SMB', 'Linstor', 'datastorecluster', 'vmfs']
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
@ -1510,10 +1510,10 @@ export default {
|
||||
}
|
||||
path += '/' + this.prefillContent.primaryStorageVmfsDatastore
|
||||
if (protocol === 'vmfs') {
|
||||
url = this.vmfsURL('dummy', path)
|
||||
url = this.vmfsURL(server, path)
|
||||
}
|
||||
if (protocol === 'datastorecluster') {
|
||||
url = this.datastoreclusterURL('dummy', path)
|
||||
url = this.datastoreclusterURL(server, path)
|
||||
}
|
||||
} else if (protocol === 'iscsi') {
|
||||
let iqn = this.prefillContent?.primaryStorageTargetIQN || ''
|
||||
|
||||
@ -413,7 +413,7 @@ export default {
|
||||
for (const index in net.traffics) {
|
||||
if (this.hypervisor === 'VMware') {
|
||||
delete this.physicalNetworks[idx].traffics[index].label
|
||||
} else {
|
||||
} else if (!net.traffics[index].label) {
|
||||
this.physicalNetworks[idx].traffics[index].label = ''
|
||||
}
|
||||
const traffic = net.traffics[index]
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user