Revision 2ff6426b lib/cmdlib/cluster.py
| b/lib/cmdlib/cluster.py | ||
|---|---|---|
| 56 | 56 |
CheckOSParams, CheckHVParams, AdjustCandidatePool, CheckNodePVs, \ |
| 57 | 57 |
ComputeIPolicyInstanceViolation, AnnotateDiskParams, SupportsOob, \ |
| 58 | 58 |
CheckIpolicyVsDiskTemplates, CheckDiskAccessModeValidity, \ |
| 59 |
CheckDiskAccessModeConsistency, CreateNewClientCert |
|
| 59 |
CheckDiskAccessModeConsistency, CreateNewClientCert, \ |
|
| 60 |
OpAddInstanceCommunicationNetwork, OpConnectInstanceCommunicationNetwork |
|
| 60 | 61 |
|
| 61 | 62 |
import ganeti.masterd.instance |
| 62 | 63 |
|
| ... | ... | |
| 1391 | 1392 |
network_exists = False |
| 1392 | 1393 |
|
| 1393 | 1394 |
if not network_exists: |
| 1394 |
op = opcodes.OpNetworkAdd( |
|
| 1395 |
network_name=network_name, |
|
| 1396 |
gateway=None, |
|
| 1397 |
network=constants.INSTANCE_COMMUNICATION_NETWORK4, |
|
| 1398 |
gateway6=None, |
|
| 1399 |
network6=constants.INSTANCE_COMMUNICATION_NETWORK6, |
|
| 1400 |
mac_prefix=constants.INSTANCE_COMMUNICATION_MAC_PREFIX, |
|
| 1401 |
add_reserved_ips=None, |
|
| 1402 |
conflicts_check=True, |
|
| 1403 |
tags=[]) |
|
| 1404 |
jobs.append(op) |
|
| 1395 |
jobs.append(OpAddInstanceCommunicationNetwork(network_name)) |
|
| 1405 | 1396 |
|
| 1406 | 1397 |
for group_uuid in cfg.GetNodeGroupList(): |
| 1407 | 1398 |
group = cfg.GetNodeGroup(group_uuid) |
| ... | ... | |
| 1416 | 1407 |
network_connected = False |
| 1417 | 1408 |
|
| 1418 | 1409 |
if not network_connected: |
| 1419 |
op = opcodes.OpNetworkConnect( |
|
| 1420 |
group_name=group_uuid, |
|
| 1421 |
network_name=network_name, |
|
| 1422 |
network_mode=constants.NIC_MODE_ROUTED, |
|
| 1423 |
network_link=constants.INSTANCE_COMMUNICATION_NETWORK_LINK, |
|
| 1424 |
conflicts_check=True) |
|
| 1410 |
op = OpConnectInstanceCommunicationNetwork(group_uuid, network_name) |
|
| 1425 | 1411 |
jobs.append(op) |
| 1426 | 1412 |
|
| 1427 | 1413 |
if jobs: |
Also available in: Unified diff