Revision a536aaac
| b/tools/cluster-merge | ||
|---|---|---|
| 274 | 274 |
for node in other_config.GetNodeList(): |
| 275 | 275 |
node_info = other_config.GetNodeInfo(node) |
| 276 | 276 |
node_info.master_candidate = False |
| 277 |
my_config.AddNode(node_info, str(fake_ec_id)) |
|
| 277 |
my_config.AddNode(node_info, _CLUSTERMERGE_ECID + str(fake_ec_id))
|
|
| 278 | 278 |
fake_ec_id += 1 |
| 279 | 279 |
|
| 280 | 280 |
for instance in other_config.GetInstanceList(): |
| ... | ... | |
| 294 | 294 |
physical_id[1] = physical_id[3] = port |
| 295 | 295 |
dsk.physical_id = tuple(physical_id) |
| 296 | 296 |
|
| 297 |
my_config.AddInstance(instance_info, str(fake_ec_id)) |
|
| 297 |
my_config.AddInstance(instance_info, |
|
| 298 |
_CLUSTERMERGE_ECID + str(fake_ec_id)) |
|
| 298 | 299 |
fake_ec_id += 1 |
| 299 | 300 |
|
| 300 | 301 |
# R0201: Method could be a function |
Also available in: Unified diff