Revision 4b75f8a4
| b/lib/cmdlib/cluster.py | ||
|---|---|---|
| 57 | 57 |
ComputeIPolicyInstanceViolation, AnnotateDiskParams, SupportsOob, \ |
| 58 | 58 |
CheckIpolicyVsDiskTemplates, CheckDiskAccessModeValidity, \ |
| 59 | 59 |
CheckDiskAccessModeConsistency, CreateNewClientCert, \ |
| 60 |
OpAddInstanceCommunicationNetwork, OpConnectInstanceCommunicationNetwork
|
|
| 60 |
AddInstanceCommunicationNetworkOp, ConnectInstanceCommunicationNetworkOp
|
|
| 61 | 61 |
|
| 62 | 62 |
import ganeti.masterd.instance |
| 63 | 63 |
|
| ... | ... | |
| 1392 | 1392 |
network_exists = False |
| 1393 | 1393 |
|
| 1394 | 1394 |
if not network_exists: |
| 1395 |
jobs.append(OpAddInstanceCommunicationNetwork(network_name))
|
|
| 1395 |
jobs.append(AddInstanceCommunicationNetworkOp(network_name))
|
|
| 1396 | 1396 |
|
| 1397 | 1397 |
for group_uuid in cfg.GetNodeGroupList(): |
| 1398 | 1398 |
group = cfg.GetNodeGroup(group_uuid) |
| ... | ... | |
| 1407 | 1407 |
network_connected = False |
| 1408 | 1408 |
|
| 1409 | 1409 |
if not network_connected: |
| 1410 |
op = OpConnectInstanceCommunicationNetwork(group_uuid, network_name)
|
|
| 1410 |
op = ConnectInstanceCommunicationNetworkOp(group_uuid, network_name)
|
|
| 1411 | 1411 |
jobs.append(op) |
| 1412 | 1412 |
|
| 1413 | 1413 |
if jobs: |
| b/lib/cmdlib/common.py | ||
|---|---|---|
| 1287 | 1287 |
return new_digest |
| 1288 | 1288 |
|
| 1289 | 1289 |
|
| 1290 |
def OpAddInstanceCommunicationNetwork(network):
|
|
| 1291 |
"""Create OpCode that adds the instance communication network. |
|
| 1290 |
def AddInstanceCommunicationNetworkOp(network):
|
|
| 1291 |
"""Create an OpCode that adds the instance communication network.
|
|
| 1292 | 1292 |
|
| 1293 | 1293 |
This OpCode contains the configuration necessary for the instance |
| 1294 | 1294 |
communication network. |
| ... | ... | |
| 1312 | 1312 |
tags=[]) |
| 1313 | 1313 |
|
| 1314 | 1314 |
|
| 1315 |
def OpConnectInstanceCommunicationNetwork(group_uuid, network):
|
|
| 1316 |
"""Create OpCode that connects a group to the instance communication
|
|
| 1317 |
network. |
|
| 1315 |
def ConnectInstanceCommunicationNetworkOp(group_uuid, network):
|
|
| 1316 |
"""Create an OpCode that connects a group to the instance
|
|
| 1317 |
communication network.
|
|
| 1318 | 1318 |
|
| 1319 | 1319 |
This OpCode contains the configuration necessary for the instance |
| 1320 | 1320 |
communication network. |
| b/lib/cmdlib/group.py | ||
|---|---|---|
| 37 | 37 |
ComputeNewInstanceViolations, GetDefaultIAllocator, ShareAll, \ |
| 38 | 38 |
CheckInstancesNodeGroups, LoadNodeEvacResult, MapInstanceLvsToNodes, \ |
| 39 | 39 |
CheckIpolicyVsDiskTemplates, CheckDiskAccessModeValidity, \ |
| 40 |
CheckDiskAccessModeConsistency, OpConnectInstanceCommunicationNetwork
|
|
| 40 |
CheckDiskAccessModeConsistency, ConnectInstanceCommunicationNetworkOp
|
|
| 41 | 41 |
|
| 42 | 42 |
import ganeti.masterd.instance |
| 43 | 43 |
|
| ... | ... | |
| 163 | 163 |
network_exists = False |
| 164 | 164 |
|
| 165 | 165 |
if network_exists: |
| 166 |
op = OpConnectInstanceCommunicationNetwork(group_uuid, network_name)
|
|
| 166 |
op = ConnectInstanceCommunicationNetworkOp(group_uuid, network_name)
|
|
| 167 | 167 |
return ResultWithJobs([[op]]) |
| 168 | 168 |
else: |
| 169 | 169 |
return None |
Also available in: Unified diff