Commit 74a48621 authored by Iustin Pop's avatar Iustin Pop
Browse files

Switch config.py to logging

A couple of more modules are using the obsolete logger functions, config
being one of them.

Reviewed-by: imsnah
parent a1578d63
...@@ -38,7 +38,6 @@ import logging ...@@ -38,7 +38,6 @@ import logging
from ganeti import errors from ganeti import errors
from ganeti import locking from ganeti import locking
from ganeti import logger
from ganeti import utils from ganeti import utils
from ganeti import constants from ganeti import constants
from ganeti import rpc from ganeti import rpc
...@@ -420,7 +419,7 @@ class ConfigWriter: ...@@ -420,7 +419,7 @@ class ConfigWriter:
if instance.disk_template != constants.DT_DISKLESS: if instance.disk_template != constants.DT_DISKLESS:
all_lvs = instance.MapLVsByNode() all_lvs = instance.MapLVsByNode()
logger.Info("Instance '%s' DISK_LAYOUT: %s" % (instance.name, all_lvs)) logging.info("Instance '%s' DISK_LAYOUT: %s", instance.name, all_lvs)
self._OpenConfig() self._OpenConfig()
self._config_data.instances[instance.name] = instance self._config_data.instances[instance.name] = instance
...@@ -741,8 +740,8 @@ class ConfigWriter: ...@@ -741,8 +740,8 @@ class ConfigWriter:
result = rpc.call_upload_file(nodelist, self._cfg_file) result = rpc.call_upload_file(nodelist, self._cfg_file)
for node in nodelist: for node in nodelist:
if not result[node]: if not result[node]:
logger.Error("copy of file %s to node %s failed" % logging.error("copy of file %s to node %s failed",
(self._cfg_file, node)) self._cfg_file, node)
bad = True bad = True
return not bad return not bad
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment