Skip to content

Commit

Permalink
feat(dedicated): raidlevel should always be number
Browse files Browse the repository at this point in the history
ref: MANAGER-15833
Signed-off-by: Jean-Baptiste Delon <[email protected]>
  • Loading branch information
JayBeeDe committed Nov 15, 2024
1 parent 6b1fc91 commit 1f68258
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ export const MOUNT_POINTS = 'defghijklmnopqrstuvwxyza';
export const MAX_MOUNT_POINTS = 24;

export const TEMPLATE_OS_SOFTWARE_RAID_LIST = {
1: ['0'],
2: ['0', '1'],
3: ['0', '1', '5'],
4: ['0', '1', '5', '10'],
5: ['0', '1', '5', '6', '10'],
6: ['0', '1', '5', '6', '10'],
7: ['0', '1', '5', '6', '7', '10'],
1: [0],
2: [0, 1],
3: [0, 1, 5],
4: [0, 1, 5, 10],
5: [0, 1, 5, 6, 10],
6: [0, 1, 5, 6, 10],
7: [0, 1, 5, 6, 7, 10],
};

export default {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,14 @@ export default class ServerInstallationOvhCtrl {
'/sys',
],

warningRaid0: '0',
warningRaid1: '1',
warningRaid5: '5',
warningRaid6: '6',
warningRaid7: '7',
warningRaid10: '10',
warningRaid50: '50',
warningRaid60: '60',
warningRaid0: 0,
warningRaid1: 1,
warningRaid5: 5,
warningRaid6: 6,
warningRaid7: 7,
warningRaid10: 10,
warningRaid50: 50,
warningRaid60: 60,
warningNone: 'none',
warningSwap: 'swap',
warningReiserfs: 'reiserfs',
Expand Down Expand Up @@ -2082,7 +2082,7 @@ export default class ServerInstallationOvhCtrl {
fileSystem: partition.fileSystem,
mountPoint: partition.mountPoint,
size: partition.partitionSize,
raidLevel: Number(partition.raid), // jbd: to be improved
raidLevel: partition.raid,
extras: {},
};
if (
Expand Down Expand Up @@ -2130,7 +2130,7 @@ export default class ServerInstallationOvhCtrl {
storage.hardwareRaid.push({
arrays: this.$scope.installation.hardwareRaid.arrays,
disks: disks.length,
raidLevel: Number(this.$scope.installation.hardwareRaid.raid), // jbd: to be improved
raidLevel: this.$scope.installation.hardwareRaid.raid,
});
}
if (this.$scope.installation.customInstall) {
Expand Down

0 comments on commit 1f68258

Please sign in to comment.