Revision 8b7b7766 lib/client/gnt_cluster.py
| b/lib/client/gnt_cluster.py | ||
|---|---|---|
| 78 | 78 |
_EPO_REACHABLE_TIMEOUT = 15 * 60 # 15 minutes |
| 79 | 79 |
|
| 80 | 80 |
|
| 81 |
def _CheckNoLvmStorageOptDeprecated(opts): |
|
| 82 |
"""Checks if the legacy option '--no-lvm-storage' is used. |
|
| 83 |
|
|
| 84 |
""" |
|
| 85 |
if not opts.lvm_storage: |
|
| 86 |
ToStderr("The option --no-lvm-storage is no longer supported. If you want"
|
|
| 87 |
" to disable lvm-based storage cluster-wide, use the option" |
|
| 88 |
" --enabled-disk-templates to disable all of these lvm-base disk " |
|
| 89 |
" templates: %s" % |
|
| 90 |
utils.CommaJoin(constants.DTS_LVM)) |
|
| 91 |
return 1 |
|
| 92 |
|
|
| 93 |
|
|
| 94 | 81 |
def _InitEnabledDiskTemplates(opts): |
| 95 | 82 |
"""Initialize the list of enabled disk templates. |
| 96 | 83 |
|
| ... | ... | |
| 156 | 143 |
@return: the desired exit code |
| 157 | 144 |
|
| 158 | 145 |
""" |
| 159 |
if _CheckNoLvmStorageOptDeprecated(opts): |
|
| 160 |
return 1 |
|
| 161 |
|
|
| 162 | 146 |
enabled_disk_templates = _InitEnabledDiskTemplates(opts) |
| 163 | 147 |
|
| 164 | 148 |
try: |
| ... | ... | |
| 1104 | 1088 |
ToStderr("Please give at least one of the parameters.")
|
| 1105 | 1089 |
return 1 |
| 1106 | 1090 |
|
| 1107 |
if _CheckNoLvmStorageOptDeprecated(opts): |
|
| 1108 |
return 1 |
|
| 1109 |
|
|
| 1110 | 1091 |
enabled_disk_templates = _GetEnabledDiskTemplates(opts) |
| 1111 | 1092 |
vg_name = _GetVgName(opts, enabled_disk_templates) |
| 1112 | 1093 |
|
| ... | ... | |
| 2040 | 2021 |
InitCluster, [ArgHost(min=1, max=1)], |
| 2041 | 2022 |
[BACKEND_OPT, CP_SIZE_OPT, ENABLED_HV_OPT, GLOBAL_FILEDIR_OPT, |
| 2042 | 2023 |
HVLIST_OPT, MAC_PREFIX_OPT, MASTER_NETDEV_OPT, MASTER_NETMASK_OPT, |
| 2043 |
NIC_PARAMS_OPT, NOLVM_STORAGE_OPT, NOMODIFY_ETCHOSTS_OPT,
|
|
| 2044 |
NOMODIFY_SSH_SETUP_OPT, SECONDARY_IP_OPT, VG_NAME_OPT,
|
|
| 2045 |
MAINTAIN_NODE_HEALTH_OPT, UIDPOOL_OPT, DRBD_HELPER_OPT,
|
|
| 2046 |
DEFAULT_IALLOCATOR_OPT, PRIMARY_IP_VERSION_OPT, PREALLOC_WIPE_DISKS_OPT,
|
|
| 2047 |
NODE_PARAMS_OPT, GLOBAL_SHARED_FILEDIR_OPT, USE_EXTERNAL_MIP_SCRIPT,
|
|
| 2048 |
DISK_PARAMS_OPT, HV_STATE_OPT, DISK_STATE_OPT, ENABLED_DISK_TEMPLATES_OPT,
|
|
| 2049 |
IPOLICY_STD_SPECS_OPT] + INSTANCE_POLICY_OPTS + SPLIT_ISPECS_OPTS,
|
|
| 2024 |
NIC_PARAMS_OPT, NOMODIFY_ETCHOSTS_OPT, NOMODIFY_SSH_SETUP_OPT,
|
|
| 2025 |
SECONDARY_IP_OPT, VG_NAME_OPT, MAINTAIN_NODE_HEALTH_OPT, UIDPOOL_OPT,
|
|
| 2026 |
DRBD_HELPER_OPT, DEFAULT_IALLOCATOR_OPT, PRIMARY_IP_VERSION_OPT,
|
|
| 2027 |
PREALLOC_WIPE_DISKS_OPT, NODE_PARAMS_OPT, GLOBAL_SHARED_FILEDIR_OPT,
|
|
| 2028 |
USE_EXTERNAL_MIP_SCRIPT, DISK_PARAMS_OPT, HV_STATE_OPT, DISK_STATE_OPT,
|
|
| 2029 |
ENABLED_DISK_TEMPLATES_OPT, IPOLICY_STD_SPECS_OPT]
|
|
| 2030 |
+ INSTANCE_POLICY_OPTS + SPLIT_ISPECS_OPTS, |
|
| 2050 | 2031 |
"[opts...] <cluster_name>", "Initialises a new cluster configuration"), |
| 2051 | 2032 |
"destroy": ( |
| 2052 | 2033 |
DestroyCluster, ARGS_NONE, [YES_DOIT_OPT], |
| ... | ... | |
| 2121 | 2102 |
SetClusterParams, ARGS_NONE, |
| 2122 | 2103 |
[FORCE_OPT, |
| 2123 | 2104 |
BACKEND_OPT, CP_SIZE_OPT, ENABLED_HV_OPT, HVLIST_OPT, MASTER_NETDEV_OPT, |
| 2124 |
MASTER_NETMASK_OPT, NIC_PARAMS_OPT, NOLVM_STORAGE_OPT, VG_NAME_OPT, |
|
| 2125 |
MAINTAIN_NODE_HEALTH_OPT, UIDPOOL_OPT, ADD_UIDS_OPT, REMOVE_UIDS_OPT, |
|
| 2126 |
DRBD_HELPER_OPT, DEFAULT_IALLOCATOR_OPT, |
|
| 2127 |
RESERVED_LVS_OPT, DRY_RUN_OPT, PRIORITY_OPT, PREALLOC_WIPE_DISKS_OPT, |
|
| 2128 |
NODE_PARAMS_OPT, USE_EXTERNAL_MIP_SCRIPT, DISK_PARAMS_OPT, HV_STATE_OPT, |
|
| 2129 |
DISK_STATE_OPT] + SUBMIT_OPTS + |
|
| 2105 |
MASTER_NETMASK_OPT, NIC_PARAMS_OPT, VG_NAME_OPT, MAINTAIN_NODE_HEALTH_OPT, |
|
| 2106 |
UIDPOOL_OPT, ADD_UIDS_OPT, REMOVE_UIDS_OPT, DRBD_HELPER_OPT, |
|
| 2107 |
DEFAULT_IALLOCATOR_OPT, RESERVED_LVS_OPT, DRY_RUN_OPT, PRIORITY_OPT, |
|
| 2108 |
PREALLOC_WIPE_DISKS_OPT, NODE_PARAMS_OPT, USE_EXTERNAL_MIP_SCRIPT, |
|
| 2109 |
DISK_PARAMS_OPT, HV_STATE_OPT, DISK_STATE_OPT] + SUBMIT_OPTS + |
|
| 2130 | 2110 |
[ENABLED_DISK_TEMPLATES_OPT, IPOLICY_STD_SPECS_OPT, MODIFY_ETCHOSTS_OPT] + |
| 2131 | 2111 |
INSTANCE_POLICY_OPTS + [GLOBAL_FILEDIR_OPT], |
| 2132 | 2112 |
"[opts...]", |
Also available in: Unified diff