Revision a744b676 lib/bdev.py
| b/lib/bdev.py | ||
|---|---|---|
| 33 | 33 |
from ganeti import constants |
| 34 | 34 |
from ganeti import objects |
| 35 | 35 |
from ganeti import compat |
| 36 |
from ganeti import netutils |
|
| 36 | 37 |
|
| 37 | 38 |
|
| 38 | 39 |
# Size of reads in _CanReadDevice |
| ... | ... | |
| 1301 | 1302 |
# about its peer. |
| 1302 | 1303 |
cls._SetMinorSyncSpeed(minor, constants.SYNC_SPEED) |
| 1303 | 1304 |
|
| 1304 |
if utils.IsValidIP6(lhost): |
|
| 1305 |
if not utils.IsValidIP6(rhost): |
|
| 1305 |
if netutils.IsValidIP6(lhost):
|
|
| 1306 |
if not netutils.IsValidIP6(rhost):
|
|
| 1306 | 1307 |
_ThrowError("drbd%d: can't connect ip %s to ip %s" %
|
| 1307 | 1308 |
(minor, lhost, rhost)) |
| 1308 | 1309 |
family = "ipv6" |
| 1309 |
elif utils.IsValidIP4(lhost): |
|
| 1310 |
if not utils.IsValidIP4(rhost): |
|
| 1310 |
elif netutils.IsValidIP4(lhost):
|
|
| 1311 |
if not netutils.IsValidIP4(rhost):
|
|
| 1311 | 1312 |
_ThrowError("drbd%d: can't connect ip %s to ip %s" %
|
| 1312 | 1313 |
(minor, lhost, rhost)) |
| 1313 | 1314 |
family = "ipv4" |
Also available in: Unified diff