Skip to content

Commit e93d674

Browse files
authored
ui-primary-storage: hide provider if Linstor protocol (#5672)
* ui-primary-storage: hide provider if Linstor protocol If Linstor protocol is selected it makes no sense to show other providers as Linstor only works with the Linstor provider. This was removed with the fix for #5613, that probably resulted from a bad merge resolving from my part. * ui-wizard: set correct provider for Linstor protocol
1 parent a8e7315 commit e93d674

2 files changed

Lines changed: 18 additions & 15 deletions

File tree

ui/src/views/infra/AddPrimaryStorage.vue

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -180,21 +180,23 @@
180180
<a-input v-decorator="['vCenterDataStore', { rules: [{ required: true, message: `${$t('label.required')}` }] }]"/>
181181
</a-form-item>
182182
</div>
183-
<a-form-item>
184-
<tooltip-label slot="label" :title="$t('label.providername')" :tooltip="apiParams.provider.description"/>
185-
<a-select
186-
v-decorator="['provider', { initialValue: providerSelected, rules: [{ required: true, message: `${$t('label.required')}`}] }]"
187-
@change="updateProviderAndProtocol"
188-
showSearch
189-
optionFilterProp="children"
190-
:filterOption="(input, option) => {
191-
return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
192-
}" >
193-
<a-select-option :value="provider" v-for="(provider,idx) in providers" :key="idx">
194-
{{ provider }}
195-
</a-select-option>
196-
</a-select>
197-
</a-form-item>
183+
<div v-if="protocolSelected !== 'Linstor'">
184+
<a-form-item>
185+
<tooltip-label slot="label" :title="$t('label.providername')" :tooltip="apiParams.provider.description"/>
186+
<a-select
187+
v-decorator="['provider', { initialValue: providerSelected, rules: [{ required: true, message: `${$t('label.required')}`}] }]"
188+
@change="updateProviderAndProtocol"
189+
showSearch
190+
optionFilterProp="children"
191+
:filterOption="(input, option) => {
192+
return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
193+
}" >
194+
<a-select-option :value="provider" v-for="(provider,idx) in providers" :key="idx">
195+
{{ provider }}
196+
</a-select-option>
197+
</a-select>
198+
</a-form-item>
199+
</div>
198200
<div v-if="this.providerSelected !== 'DefaultPrimary' && this.providerSelected !== 'PowerFlex' && this.providerSelected !== 'Linstor'">
199201
<a-form-item>
200202
<tooltip-label slot="label" :title="$t('label.ismanaged')" :tooltip="apiParams.managed.description"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1340,6 +1340,7 @@ export default {
13401340
url = this.rbdURL(rbdmonitor, rbdpool, rbdid, rbdsecret)
13411341
} else if (protocol === 'Linstor') {
13421342
url = this.linstorURL(server)
1343+
params.provider = 'Linstor'
13431344
params['details[0].resourceGroup'] = this.prefillContent.primaryStorageLinstorResourceGroup.value
13441345
} else if (protocol === 'vmfs' || protocol === 'datastorecluster') {
13451346
let path = this.prefillContent.primaryStorageVmfsDatacenter.value

0 commit comments

Comments
 (0)