etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ui: show datastore cluster option in vmware zone deployment (#5522) 

Co-authored-by: DK101010 <dirk.klahre@itelligence.de>
This commit is contained in:
DK101010 2021-09-29 06:22:38 +02:00 committed by GitHub
parent 37d22646b2
commit 9ef7355399
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/src/views/infra/zone/ZoneWizardAddResources.vue
View File

@ -477,7 +477,7 @@ export default {
placeHolder: 'message.error.vcenter.datacenter',
required: true,
display: {
primaryStorageProtocol: 'vmfs'
primaryStorageProtocol: ['vmfs', 'datastorecluster']
}
},
{
@ -486,7 +486,7 @@ export default {
placeHolder: 'message.error.vcenter.datastore',
required: true,
display: {
primaryStorageProtocol: 'vmfs'
primaryStorageProtocol: ['vmfs', 'datastorecluster']
}
},
{
@ -861,6 +861,10 @@ export default {
id: 'vmfs',
description: 'vmfs'
})
protocols.push({
id: 'datastorecluster',
description: 'datastorecluster'
})
} else if (hypervisor === 'Hyperv') {
protocols.push({
id: 'SMB',

28
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue
View File

@ -1338,16 +1338,21 @@ export default {
const rbdid = this.prefillContent.primaryStorageRADOSUser?.value || ''
const rbdsecret = this.prefillContent.primaryStorageRADOSSecret?.value || ''
url = this.rbdURL(rbdmonitor, rbdpool, rbdid, rbdsecret)
} else if (protocol === 'vmfs') {
let path = this.prefillContent.primaryStorageVmfsDatacenter?.value || ''
if (path.substring(0, 1) !== '/') {
path = '/' + path
}
path += '/' + this.prefillContent.primaryStorageVmfsDatastore?.value || ''
url = this.vmfsURL('dummy', path)
} else if (protocol === 'Linstor') {
url = this.linstorURL(server)
params['details[0].resourceGroup'] = this.prefillContent.primaryStorageLinstorResourceGroup.value
} else if (protocol === 'vmfs' || protocol === 'datastorecluster') {
let path = this.prefillContent.primaryStorageVmfsDatacenter.value
if (path.substring(0, 1) !== '/') {
path = '/' + path
}
path += '/' + this.prefillContent.primaryStorageVmfsDatastore.value
if (protocol === 'vmfs') {
url = this.vmfsURL('dummy', path)
}
if (protocol === 'datastorecluster') {
url = this.datastoreclusterURL('dummy', path)
}
} else {
let iqn = this.prefillContent.primaryStorageTargetIQN?.value || ''
if (iqn.substring(0, 1) !== '/') {
@ -2137,6 +2142,15 @@ export default {
}
return url
},
datastoreclusterURL (server, path) {
var url
if (server.indexOf('://') === -1) {
url = 'datastorecluster://' + server + path
} else {
url = server + path
}
return url
},
iscsiURL (server, iqn, lun) {
let url = ''
if (server.indexOf('://') === -1) {