Convert write_ssconf_files to new style

[ganeti-local] / lib / config.py

diff --git a/lib/config.py b/lib/config.py
index 2e3a4f2..21f6c18 100644 (file)
--- a/lib/config.py
+++ b/lib/config.py
@@ -1070,7 +1070,7 @@ class ConfigWriter:
       msg = to_result.RemoteFailMsg()
       if msg:
         msg = ("Copy of file %s to node %s failed: %s" %
-                (self._cfg_file, node, msg))
+               (self._cfg_file, to_node, msg))
         logging.error(msg)
         bad = True
     return not bad
@@ -1106,8 +1106,14 @@ class ConfigWriter:
     # Write ssconf files on all nodes (including locally)
     if self._last_cluster_serial < self._config_data.cluster.serial_no:
       if not self._offline:
-        rpc.RpcRunner.call_write_ssconf_files(self._UnlockedGetNodeList(),
-                                              self._UnlockedGetSsconfValues())
+        result = rpc.RpcRunner.call_write_ssconf_files(\
+          self._UnlockedGetNodeList(),
+          self._UnlockedGetSsconfValues())
+        for nname, nresu in result.items():
+          msg = nresu.RemoteFailMsg()
+          if msg:
+            logging.warning("Error while uploading ssconf files to"
+                            " node %s: %s", nname, msg)
       self._last_cluster_serial = self._config_data.cluster.serial_no
 
   def _UnlockedGetSsconfValues(self):
@@ -1189,13 +1195,6 @@ class ConfigWriter:
     self._WriteConfig()
 
   @locking.ssynchronized(_config_lock, shared=1)
-  def GetDefBridge(self):
-    """Return the default bridge.
-
-    """
-    return self._config_data.cluster.default_bridge
-
-  @locking.ssynchronized(_config_lock, shared=1)
   def GetMACPrefix(self):
     """Return the mac prefix.