Revision 8106dd64 src/Ganeti/Constants.hs
b/src/Ganeti/Constants.hs | ||
---|---|---|
789 | 789 |
dtExt :: String |
790 | 790 |
dtExt = Types.diskTemplateToRaw DTExt |
791 | 791 |
|
792 |
dtGluster :: String |
|
793 |
dtGluster = Types.diskTemplateToRaw DTGluster |
|
794 |
|
|
792 | 795 |
-- | This is used to order determine the default disk template when |
793 | 796 |
-- the list of enabled disk templates is inferred from the current |
794 | 797 |
-- state of the cluster. This only happens on an upgrade from a |
... | ... | |
797 | 800 |
diskTemplatePreference :: [String] |
798 | 801 |
diskTemplatePreference = |
799 | 802 |
map Types.diskTemplateToRaw |
800 |
[DTBlock, DTDiskless, DTDrbd8, DTExt, DTFile, DTPlain, DTRbd, DTSharedFile] |
|
803 |
[DTBlock, DTDiskless, DTDrbd8, DTExt, DTFile, |
|
804 |
DTPlain, DTRbd, DTSharedFile, DTGluster] |
|
801 | 805 |
|
802 | 806 |
diskTemplates :: FrozenSet String |
803 | 807 |
diskTemplates = ConstantUtils.mkSet $ map Types.diskTemplateToRaw [minBound..] |
... | ... | |
818 | 822 |
(DTFile, StorageFile), |
819 | 823 |
(DTDiskless, StorageDiskless), |
820 | 824 |
(DTPlain, StorageLvmVg), |
821 |
(DTRbd, StorageRados)] |
|
825 |
(DTRbd, StorageRados), |
|
826 |
(DTGluster, StorageFile)] |
|
822 | 827 |
|
823 | 828 |
-- | The set of network-mirrored disk templates |
824 | 829 |
dtsIntMirror :: FrozenSet String |
... | ... | |
828 | 833 |
dtsExtMirror :: FrozenSet String |
829 | 834 |
dtsExtMirror = |
830 | 835 |
ConstantUtils.mkSet $ |
831 |
map Types.diskTemplateToRaw [DTDiskless, DTBlock, DTExt, DTSharedFile, DTRbd] |
|
836 |
map Types.diskTemplateToRaw |
|
837 |
[DTDiskless, DTBlock, DTExt, DTSharedFile, DTRbd, DTGluster] |
|
832 | 838 |
|
833 | 839 |
-- | The set of non-lvm-based disk templates |
834 | 840 |
dtsNotLvm :: FrozenSet String |
835 | 841 |
dtsNotLvm = |
836 | 842 |
ConstantUtils.mkSet $ |
837 | 843 |
map Types.diskTemplateToRaw |
838 |
[DTSharedFile, DTDiskless, DTBlock, DTExt, DTFile, DTRbd] |
|
844 |
[DTSharedFile, DTDiskless, DTBlock, DTExt, DTFile, DTRbd, DTGluster]
|
|
839 | 845 |
|
840 | 846 |
-- | The set of disk templates which can be grown |
841 | 847 |
dtsGrowable :: FrozenSet String |
842 | 848 |
dtsGrowable = |
843 | 849 |
ConstantUtils.mkSet $ |
844 | 850 |
map Types.diskTemplateToRaw |
845 |
[DTSharedFile, DTDrbd8, DTPlain, DTExt, DTFile, DTRbd] |
|
851 |
[DTSharedFile, DTDrbd8, DTPlain, DTExt, DTFile, DTRbd, DTGluster]
|
|
846 | 852 |
|
847 | 853 |
-- | The set of disk templates that allow adoption |
848 | 854 |
dtsMayAdopt :: FrozenSet String |
... | ... | |
860 | 866 |
-- | The set of file based disk templates |
861 | 867 |
dtsFilebased :: FrozenSet String |
862 | 868 |
dtsFilebased = |
863 |
ConstantUtils.mkSet $ map Types.diskTemplateToRaw [DTSharedFile, DTFile] |
|
869 |
ConstantUtils.mkSet $ map Types.diskTemplateToRaw |
|
870 |
[DTSharedFile, DTFile, DTGluster] |
|
864 | 871 |
|
865 | 872 |
-- | The set of disk templates that can be moved by copying |
866 | 873 |
-- |
... | ... | |
878 | 885 |
dtsNoFreeSpaceCheck :: FrozenSet String |
879 | 886 |
dtsNoFreeSpaceCheck = |
880 | 887 |
ConstantUtils.mkSet $ |
881 |
map Types.diskTemplateToRaw [DTExt, DTSharedFile, DTFile, DTRbd] |
|
888 |
map Types.diskTemplateToRaw [DTExt, DTSharedFile, DTFile, DTRbd, DTGluster]
|
|
882 | 889 |
|
883 | 890 |
dtsBlock :: FrozenSet String |
884 | 891 |
dtsBlock = |
... | ... | |
3763 | 3770 |
, (ldpAccess, PyValueEx diskKernelspace) |
3764 | 3771 |
]) |
3765 | 3772 |
, (DTSharedFile, Map.empty) |
3773 |
, (DTGluster, Map.empty) |
|
3766 | 3774 |
] |
3767 | 3775 |
|
3768 | 3776 |
diskDtDefaults :: Map DiskTemplate (Map String PyValueEx) |
... | ... | |
3795 | 3803 |
, (rbdAccess, PyValueEx diskKernelspace) |
3796 | 3804 |
]) |
3797 | 3805 |
, (DTSharedFile, Map.empty) |
3806 |
, (DTGluster, Map.empty) |
|
3798 | 3807 |
] |
3799 | 3808 |
|
3800 | 3809 |
niccDefaults :: Map String PyValueEx |
... | ... | |
4577 | 4586 |
|
4578 | 4587 |
jstoreJobsPerArchiveDirectory :: Int |
4579 | 4588 |
jstoreJobsPerArchiveDirectory = 10000 |
4589 |
|
|
4590 |
-- * Gluster settings |
|
4591 |
|
|
4592 |
-- | Where Ganeti should manage Gluster volume mountpoints |
|
4593 |
glusterMountpoint :: String |
|
4594 |
glusterMountpoint = "/var/run/ganeti/gluster" |
Also available in: Unified diff