Revision 43c54ced
| b/lib/cmdlib/cluster.py | ||
|---|---|---|
| 2294 | 2294 |
" but missing on this node: %s", |
| 2295 | 2295 |
self.cfg.GetNodeName(base.uuid), utils.CommaJoin(missing)) |
| 2296 | 2296 |
|
| 2297 |
def _VerifyFileStoragePaths(self, ninfo, nresult, is_master): |
|
| 2297 |
def _VerifyFileStoragePaths(self, ninfo, nresult, is_master, |
|
| 2298 |
enabled_disk_templates): |
|
| 2298 | 2299 |
"""Verifies paths in L{pathutils.FILE_STORAGE_PATHS_FILE}.
|
| 2299 | 2300 |
|
| 2300 | 2301 |
@type ninfo: L{objects.Node}
|
| ... | ... | |
| 2305 | 2306 |
|
| 2306 | 2307 |
""" |
| 2307 | 2308 |
if (is_master and |
| 2308 |
(constants.ENABLE_FILE_STORAGE or
|
|
| 2309 |
constants.ENABLE_SHARED_FILE_STORAGE)):
|
|
| 2309 |
(utils.storage.IsFileStorageEnabled(enabled_disk_templates) or
|
|
| 2310 |
utils.storage.IsSharedFileStorageEnabled(enabled_disk_templates))):
|
|
| 2310 | 2311 |
try: |
| 2311 | 2312 |
fspaths = nresult[constants.NV_FILE_STORAGE_PATHS] |
| 2312 | 2313 |
except KeyError: |
| ... | ... | |
| 2833 | 2834 |
self._VerifyNodeUserScripts(node_i, nresult) |
| 2834 | 2835 |
self._VerifyOob(node_i, nresult) |
| 2835 | 2836 |
self._VerifyFileStoragePaths(node_i, nresult, |
| 2836 |
node_i.uuid == master_node_uuid) |
|
| 2837 |
node_i.uuid == master_node_uuid, |
|
| 2838 |
cluster.enabled_disk_templates) |
|
| 2837 | 2839 |
|
| 2838 | 2840 |
if nimg.vm_capable: |
| 2839 | 2841 |
self._UpdateVerifyNodeLVM(node_i, nresult, vg_name, nimg) |
Also available in: Unified diff