From 5909fb976b1d133a27d2bd7b45e8ca46aefbec5d Mon Sep 17 00:00:00 2001
From: Luca Bigliardi <shammash@google.com>
Date: Mon, 10 Aug 2009 19:24:04 +0100
Subject: [PATCH] Map Node/IP in ssconf IP lists
Map the node hostname with its primary/secondary ganeti IP in ssconf.
In this way a node can discover which are its IPs simply grepping ssconf files,
thus avoiding checks depending on network configuration.
Signed-off-by: Luca Bigliardi <shammash@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
lib/config.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/config.py b/lib/config.py
index 26e38bd75..589f36ed7 100644
--- a/lib/config.py
+++ b/lib/config.py
@@ -1148,8 +1148,10 @@ class ConfigWriter:
instance_names = utils.NiceSort(self._UnlockedGetInstanceList())
node_names = utils.NiceSort(self._UnlockedGetNodeList())
node_info = [self._UnlockedGetNodeInfo(name) for name in node_names]
- node_pri_ips = [ninfo.primary_ip for ninfo in node_info]
- node_snd_ips = [ninfo.secondary_ip for ninfo in node_info]
+ node_pri_ips = ["%s,%s" % (ninfo.name, ninfo.primary_ip)
+ for ninfo in node_info]
+ node_snd_ips = ["%s,%s" % (ninfo.name, ninfo.secondary_ip)
+ for ninfo in node_info]
instance_data = fn(instance_names)
off_data = fn(node.name for node in node_info if node.offline)
--
GitLab