Revision fda5f19f
| b/lib/bootstrap.py | ||
|---|---|---|
| 38 | 38 |
from ganeti import objects |
| 39 | 39 |
from ganeti import ssconf |
| 40 | 40 |
|
| 41 |
from ganeti.rpc import RpcRunner |
|
| 42 |
|
|
| 43 | 41 |
def _InitSSHSetup(node): |
| 44 | 42 |
"""Setup the SSH configuration for the cluster. |
| 45 | 43 |
|
| ... | ... | |
| 229 | 227 |
|
| 230 | 228 |
# start the master ip |
| 231 | 229 |
# TODO: Review rpc call from bootstrap |
| 232 |
RpcRunner.call_node_start_master(hostname.name, True) |
|
| 230 |
rpc.RpcRunner.call_node_start_master(hostname.name, True)
|
|
| 233 | 231 |
|
| 234 | 232 |
|
| 235 | 233 |
def InitConfig(version, cluster_config, master_node_config, |
| ... | ... | |
| 274 | 272 |
begun in cmdlib.LUDestroyOpcode. |
| 275 | 273 |
|
| 276 | 274 |
""" |
| 277 |
if not RpcRunner.call_node_stop_master(master, True): |
|
| 275 |
if not rpc.RpcRunner.call_node_stop_master(master, True):
|
|
| 278 | 276 |
logging.warning("Could not disable the master role")
|
| 279 |
if not RpcRunner.call_node_leave_cluster(master): |
|
| 277 |
if not rpc.RpcRunner.call_node_leave_cluster(master):
|
|
| 280 | 278 |
logging.warning("Could not shutdown the node daemon and cleanup the node")
|
| 281 | 279 |
|
| 282 | 280 |
|
| ... | ... | |
| 372 | 370 |
|
| 373 | 371 |
logging.info("Setting master to %s, old master: %s", new_master, old_master)
|
| 374 | 372 |
|
| 375 |
if not RpcRunner.call_node_stop_master(old_master, True): |
|
| 373 |
if not rpc.RpcRunner.call_node_stop_master(old_master, True):
|
|
| 376 | 374 |
logging.error("Could not disable the master role on the old master"
|
| 377 | 375 |
" %s, please disable manually", old_master) |
| 378 | 376 |
|
| ... | ... | |
| 381 | 379 |
|
| 382 | 380 |
# Here we have a phase where no master should be running |
| 383 | 381 |
|
| 384 |
if not RpcRunner.call_upload_file(cfg.GetNodeList(), |
|
| 382 |
if not rpc.RpcRunner.call_upload_file(cfg.GetNodeList(),
|
|
| 385 | 383 |
constants.CLUSTER_CONF_FILE): |
| 386 | 384 |
logging.error("Could not distribute the new configuration"
|
| 387 | 385 |
" to the other nodes, please check.") |
| 388 | 386 |
|
| 389 | 387 |
|
| 390 |
if not RpcRunner.call_node_start_master(new_master, True): |
|
| 388 |
if not rpc.RpcRunner.call_node_start_master(new_master, True):
|
|
| 391 | 389 |
logging.error("Could not start the master role on the new master"
|
| 392 | 390 |
" %s, please check", new_master) |
| 393 | 391 |
rcode = 1 |
Also available in: Unified diff