Skip to content

Commit 6262366

Browse files
Pearl1594Pearl Dsilva
andauthored
ui: Fix add primary store during Zone Deployment for PreSetup protocol (#4845)
Co-authored-by: Pearl Dsilva <pearl.dsilva@shapeblue.com>
1 parent 5895435 commit 6262366

2 files changed

Lines changed: 9 additions & 3 deletions

File tree

ui/src/views/infra/zone/ZoneWizardAddResources.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ export default {
351351
}
352352
},
353353
{
354-
title: 'label.SR.name',
354+
title: 'label.sr.name',
355355
key: 'primaryStorageSRLabel',
356356
placeHolder: 'message.error.sr.namelabel',
357357
required: true,

ui/src/views/infra/zone/ZoneWizardLaunchZone.vue

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1283,7 +1283,7 @@ export default {
12831283
}
12841284
}
12851285
1286-
const server = this.prefillContent.primaryStorageServer ? this.prefillContent.primaryStorageServer.value : null
1286+
var server = this.prefillContent.primaryStorageServer ? this.prefillContent.primaryStorageServer.value : null
12871287
let url = ''
12881288
const protocol = this.prefillContent.primaryStorageProtocol.value
12891289
@@ -1303,7 +1303,13 @@ export default {
13031303
params['details[0].password'] = this.prefillContent.primaryStorageSMBPassword.value
13041304
params['details[0].domain'] = this.prefillContent.primaryStorageSMBDomain.value
13051305
} else if (protocol === 'PreSetup') {
1306-
let path = this.prefillContent.primaryStoragePath.value
1306+
let path = ''
1307+
if (this.stepData.clusterReturned.hypervisortype === 'XenServer') {
1308+
path = this.prefillContent.primaryStorageSRLabel.value
1309+
server = 'localhost'
1310+
} else {
1311+
path = this.prefillContent.primaryStoragePath.value
1312+
}
13071313
if (path.substring(0, 1) !== '/') {
13081314
path = '/' + path
13091315
}

0 commit comments

Comments
 (0)