Revision 3b9e6a30
b/lib/backend.py | ||
---|---|---|
32 | 32 |
import subprocess |
33 | 33 |
import random |
34 | 34 |
import logging |
35 |
import tempfile |
|
35 | 36 |
|
36 | 37 |
from ganeti import errors |
37 | 38 |
from ganeti import utils |
... | ... | |
120 | 121 |
result = utils.RunCmd(["ip", "address", "del", "%s/32" % master_ip, |
121 | 122 |
"dev", master_netdev]) |
122 | 123 |
if result.failed: |
123 |
logger.error("Can't remove the master IP, error: %s", result.output)
|
|
124 |
logging.error("Can't remove the master IP, error: %s", result.output)
|
|
124 | 125 |
# but otherwise ignore the failure |
125 | 126 |
|
126 | 127 |
if stop_daemons: |
b/lib/bootstrap.py | ||
---|---|---|
315 | 315 |
|
316 | 316 |
if not rpc.call_upload_file(cfg.GetNodeList(), |
317 | 317 |
ss.KeyToFilename(ss.SS_MASTER_NODE)): |
318 |
logger.Error("could not distribute the new simple store master file"
|
|
319 |
" to the other nodes, please check.") |
|
318 |
logging.error("could not distribute the new simple store master file"
|
|
319 |
" to the other nodes, please check.")
|
|
320 | 320 |
|
321 | 321 |
if not rpc.call_node_start_master(new_master, True): |
322 | 322 |
logging.error("could not start the master role on the new master" |
b/lib/hypervisor/hv_fake.py | ||
---|---|---|
198 | 198 |
finally: |
199 | 199 |
fh.close() |
200 | 200 |
except EnvironmentError, err: |
201 |
raise HypervisorError("Failed to list node info: %s" % err) |
|
201 |
raise errors.HypervisorError("Failed to list node info: %s" % err)
|
|
202 | 202 |
result['cpu_total'] = cpu_total |
203 | 203 |
|
204 | 204 |
return result |
Also available in: Unified diff