Replace ssconf with configuration.
---
scripts/gnt-cluster | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/scripts/gnt-cluster b/scripts/gnt-cluster
index 4f11d11..ba1baca 100755
--- a/scripts/gnt-cluster
+++ b/scripts/gnt-cluster
@@ -32,7 +32,6 @@ from ganeti import utils
from ganeti import bootstrap
from ganeti import ssh
from ganeti import simpleconfig
-from ganeti import ssconf
def InitCluster(opts, args):
@@ -128,8 +127,7 @@ def ShowClusterMaster(opts, args):
opts - class with options as members
"""
- sstore = ssconf.SimpleStore()
- print sstore.GetMasterNode()
+ print GetClient().QueryConfigValues(["master_node"])[0]
return 0
@@ -172,6 +170,8 @@ def ClusterCopyFile(opts, args):
op = opcodes.OpQueryNodes(output_fields=["name"], names=opts.nodes)
results = [row[0] for row in SubmitOpCode(op) if row[0] != myname]
+
+ # TODO: Potential inconsistency between local node and master
srun = ssh.SshRunner(cfg)
for node in results:
if not srun.CopyFileToNode(node, filename):
@@ -197,8 +197,8 @@ def RunClusterCommand(opts, args):
op = opcodes.OpQueryNodes(output_fields=["name"], names=opts.nodes)
nodes = [row[0] for row in SubmitOpCode(op)]
- sstore = ssconf.SimpleStore()
- master_node = sstore.GetMasterNode()
+ # TODO: Potential inconsistency between local node and master
+ master_node = cfg.GetMasterNode()
srun = ssh.SshRunner(cfg)
# Make sure master node is at list end
--
1.6.0.2
