Skip to content

Commit

Permalink
feat(dedicated): add a way to identify whether lvm or not
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
JayBeeDe committed Nov 15, 2024
1 parent 3426f7d commit face55c
Show file tree
Hide file tree
Showing 3 changed files with 97 additions and 25 deletions.
5 changes: 4 additions & 1 deletion ...lient/app/dedicated/dedicated-server/clusters/nodes/node/translations/Messages_fr_FR.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,10 @@
"server_configuration_installation_ovh_step2_hide_all_disk": "Masquer les autres disques",
"server_configuration_installation_ovh_step2_file_system": "Système de fichiers",
"server_configuration_installation_ovh_step2_mount_point": "Point de montage",
"server_configuration_installation_ovh_step2_volume_name": "Nom du volume logique (LVM) / zpool (ZFS)",
"server_configuration_installation_ovh_step2_lvm": "LVM",
"server_configuration_installation_ovh_step2_all_name": "Nom du volume logique (LVM) / zpool (ZFS)",
"server_configuration_installation_ovh_step2_lv_name": "Nom du volume logique (LVM)",
"server_configuration_installation_ovh_step2_zp_name": "Nom du zpool (ZFS)",
"server_configuration_installation_ovh_step2_raid": "Raid",
"server_configuration_installation_ovh_step2_raid_help": "Le RAID (à partir du RAID 1) permet de répliquer des données sur plusieurs disques durs afin d'améliorer la sauvegarde des données du serveur en cas de panne. Attention : le RAID 0 ne sauvegarde pas les données, il est donc déconseillé.",
"server_configuration_installation_ovh_step2_available_size": "Taille de la partition",
Expand Down
5 changes: 4 additions & 1 deletion ...ted/client/app/dedicated/dedicated-server/servers/server/translations/Messages_fr_FR.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,10 @@
"server_configuration_installation_ovh_step2_hide_all_disk": "Masquer les autres disques",
"server_configuration_installation_ovh_step2_file_system": "Système de fichiers",
"server_configuration_installation_ovh_step2_mount_point": "Point de montage",
"server_configuration_installation_ovh_step2_volume_name": "Nom du volume logique (LVM) / zpool (ZFS)",
"server_configuration_installation_ovh_step2_lvm": "LVM",
"server_configuration_installation_ovh_step2_all_name": "Nom du volume logique (LVM) / zpool (ZFS)",
"server_configuration_installation_ovh_step2_lv_name": "Nom du volume logique (LVM)",
"server_configuration_installation_ovh_step2_zp_name": "Nom du zpool (ZFS)",
"server_configuration_installation_ovh_step2_raid": "Raid",
"server_configuration_installation_ovh_step2_raid_help": "Le RAID (à partir du RAID 1) permet de répliquer des données sur plusieurs disques durs afin d'améliorer la sauvegarde des données du serveur en cas de panne. Attention : le RAID 0 ne sauvegarde pas les données, il est donc déconseillé.",
"server_configuration_installation_ovh_step2_available_size": "Taille de la partition",
Expand Down
112 changes: 89 additions & 23 deletions ...m-server-components/src/general-information/installation/ovh/server-installation-ovh.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -501,10 +501,11 @@
</div>

<div class="table-responsive">
<table class="table table-striped">
<table class="table table-striped text-center">
<thead>
<tr>
<th
class="text-center"
data-ng-if="!informations.softRaidOnlyMirroring"
>
<span
Expand All @@ -515,17 +516,38 @@
</span>
</th>
<th
class="text-center"
data-translate="server_configuration_installation_ovh_step2_file_system"
></th>
<th
class="text-center"
data-ng-if="!informations.softRaidOnlyMirroring"
data-translate="server_configuration_installation_ovh_step2_mount_point"
></th>
<th
data-ng-if="!informations.softRaidOnlyMirroring"
data-translate="server_configuration_installation_ovh_step2_volume_name"
class="text-center"
data-ng-if="installation.selectDistribution.lvmReady"
data-translate="server_configuration_installation_ovh_step2_lvm"
></th>
<!-- volume name -->
<th
class="text-center"
data-ng-if="installation.selectDistribution.lvmReady && installation.selectDistribution.filesystems.indexOf(constants.warningZFS) === -1"
data-translate="server_configuration_installation_ovh_step2_lv_name"
></th>
<th
class="text-center"
data-ng-if="!installation.selectDistribution.lvmReady && installation.selectDistribution.filesystems.indexOf(constants.warningZFS) > -1"
data-translate="server_configuration_installation_ovh_step2_zp_name"
></th>
<th
class="text-center"
data-ng-if="installation.selectDistribution.lvmReady && installation.selectDistribution.filesystems.indexOf(constants.warningZFS) > -1"
data-translate="server_configuration_installation_ovh_step2_all_name"
></th>
<!-- end volume name -->
<th
class="text-center"
data-ng-show="installation.nbDiskUse > 1 && !informations.raidController"
>
<span
Expand All @@ -539,10 +561,12 @@
</span>
</th>
<th
scope="col"
class="text-center"
data-ng-if="informations.softRaidOnlyMirroring"
></th>
<th>
<th
class="text-center"
>
<span
data-translate="server_configuration_installation_ovh_step2_available_size"
></span>
Expand All @@ -554,6 +578,7 @@
</span>
</th>
<th
class="text-center"
data-ng-show="installation.nbDiskUse > 1 && !informations.raidController && !informations.softRaidOnlyMirroring"
>
<span
Expand Down Expand Up @@ -641,6 +666,17 @@
data-ng-disabled="informations.softRaidOnlyMirroring"
/>
</td>
<td
class="form-group"
data-ng-if="installation.selectDistribution.lvmReady"
>
<oui-checkbox
inline="true"
data-disabled
data-model="partition.volumeName && partition.fileSystem !== constants.warningZFS && partition.fileSystem !== constants.warningSwap ? true : false"
>
</oui-checkbox>
</td>
<td
class="form-group"
data-ng-if="!informations.softRaidOnlyMirroring"
Expand Down Expand Up @@ -679,20 +715,20 @@
</span>
<span
data-ng-hide="$ctrl.isSetPartition(partition) || partition.fileSystem == constants.warningSwap"
data-ng-bind="partition.raid.replace('_', '')"
data-ng-bind="partition.raid"
>
</span>
<select
class="form-control"
data-ng-if="$ctrl.isSetPartition(partition) && partition.fileSystem != constants.warningSwap && !informations.softRaidOnlyMirroring"
data-ng-options="raid as raid.replace('_', '') for raid in $ctrl.getRaidList(installation.nbDiskUse)"
data-ng-options="raid as raid for raid in $ctrl.getRaidList(installation.nbDiskUse)"
data-ng-model="partition.raid"
data-ng-change="$ctrl.validationRaid(partition)"
>
</select>
<span
data-ng-if="$ctrl.isSetPartition(partition) && partition.fileSystem != constants.warningSwap && informations.softRaidOnlyMirroring"
data-ng-bind="partition.raid.replace('_', '')"
data-ng-bind="partition.raid"
>
</span>
<span
Expand Down Expand Up @@ -794,7 +830,9 @@
>
</span>
</td>
<td>
<td
class="text-left"
>
<button
type="button"
class="btn btn-link"
Expand Down Expand Up @@ -934,14 +972,14 @@
<select
class="form-control"
data-ng-if="newPartition.fileSystem !== constants.warningSwap && !informations.softRaidOnlyMirroring"
data-ng-options="raid as raid.replace('_','') for raid in $ctrl.getRaidList(installation.nbDiskUse)"
data-ng-options="raid in $ctrl.getRaidList(installation.nbDiskUse)"
data-ng-model="newPartition.raid"
data-ng-change="$ctrl.validationRaid(newPartition)"
>
</select>
<span
data-ng-if="informations.softRaidOnlyMirroring"
data-ng-bind="newPartition.raid.replace('_', '')"
data-ng-bind="newPartition.raid"
>
</span>
</td>
Expand Down Expand Up @@ -1491,11 +1529,11 @@
</select>
</p>

<table class="table table-striped">
<table class="table table-striped text-center">
<thead>
<tr>
<th
scope="col"
class="text-center"
data-ng-if="!informations.softRaidOnlyMirroring"
>
<span
Expand All @@ -1506,21 +1544,38 @@
</span>
</th>
<th
scope="col"
class="text-center"
data-translate="server_configuration_installation_ovh_step2_file_system"
></th>
<th
scope="col"
class="text-center"
data-ng-if="!informations.softRaidOnlyMirroring"
data-translate="server_configuration_installation_ovh_step2_mount_point"
></th>
<th
scope="col"
data-ng-if="!informations.softRaidOnlyMirroring"
data-translate="server_configuration_installation_ovh_step2_volume_name"
class="text-center"
data-ng-if="installation.selectDistribution.lvmReady"
data-translate="server_configuration_installation_ovh_step2_lvm"
></th>
<!-- volume name -->
<th
class="text-center"
data-ng-if="installation.selectDistribution.lvmReady && installation.selectDistribution.filesystems.indexOf(constants.warningZFS) === -1"
data-translate="server_configuration_installation_ovh_step2_lv_name"
></th>
<th
class="text-center"
data-ng-if="!installation.selectDistribution.lvmReady && installation.selectDistribution.filesystems.indexOf(constants.warningZFS) > -1"
data-translate="server_configuration_installation_ovh_step2_zp_name"
></th>
<th
scope="col"
class="text-center"
data-ng-if="installation.selectDistribution.lvmReady && installation.selectDistribution.filesystems.indexOf(constants.warningZFS) > -1"
data-translate="server_configuration_installation_ovh_step2_all_name"
></th>
<!-- end volume name -->
<th
class="text-center"
data-ng-if="installation.nbDiskUse > 1 && !informations.raidController && !informations.softRaidOnlyMirroring"
>
<span
Expand All @@ -1534,7 +1589,9 @@
</span>
</th>

<th scope="col">
<th
class="text-center"
>
<span
data-translate="server_configuration_installation_ovh_step2_available_size"
></span>
Expand All @@ -1546,7 +1603,7 @@
</span>
</th>
<th
scope="col"
class="text-center"
data-ng-if="installation.nbDiskUse > 1 && !informations.raidController && !informations.softRaidOnlyMirroring"
>
<span
Expand All @@ -1567,7 +1624,6 @@
>
<th
data-ng-if="!informations.softRaidOnlyMirroring"
scope="row"
data-ng-bind="partition.order"
></th>
<td>
Expand All @@ -1586,6 +1642,16 @@
data-ng-if="!informations.softRaidOnlyMirroring"
data-ng-bind="partition.mountPoint"
></td>
<td
data-ng-if="installation.selectDistribution.lvmReady"
>
<oui-checkbox
inline="true"
data-disabled
data-model="partition.volumeName && partition.fileSystem !== constants.warningZFS && partition.fileSystem !== constants.warningSwap ? true : false"
>
</oui-checkbox>
</td>
<td
data-ng-if="!informations.softRaidOnlyMirroring"
>
Expand All @@ -1610,7 +1676,7 @@
</span>
<span
data-ng-if="partition.fileSystem != constants.warningSwap"
data-ng-bind="partition.raid.replace('_', '')"
data-ng-bind="partition.raid"
>
</span>
<span
Expand Down

0 comments on commit face55c

Please sign in to comment.