summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNishanth Thomas <nthomas@redhat.com>2014-04-04 15:17:03 +0530
committerBala.FA <barumuga@redhat.com>2014-04-29 10:21:37 +0530
commita760c8df4f4ce29374c3dbb924695e013f58133b (patch)
treece9d47064529511ca438922c6a4ff8fd573f1966
parent3f8ce76f2458fea466179ab74cca5712ec7c34d9 (diff)
Autoconfig:Modified the discoverlogicalelements
to accept the new format of data receieved from the node. removed the call to get the hostname of the gluster node Change-Id: I99a48cfe03672ee419ea5f586aa35b4b3ab325af Signed-off-by: Nishanth Thomas <nthomas@redhat.com> Reviewed-on: https://code.engineering.redhat.com/gerrit/22549 Reviewed-by: Kanagaraj Mayilsamy <kmayilsa@redhat.com> Tested-by: Ramesh Nachimuthu <rnachimu@redhat.com>
-rwxr-xr-xplugins/discovery.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/plugins/discovery.py b/plugins/discovery.py
index 3fd5573..31781d8 100755
--- a/plugins/discovery.py
+++ b/plugins/discovery.py
@@ -84,15 +84,13 @@ def discovercluster(args):
hostlist.append({"hostip": args.hostip})
for host in hostlist:
if(ipPat.match(host['hostip'])):
- host.update(discoverhostdetails(host['hostip'], args))
+ #host.update(discoverhostdetails(host['hostip'], args))
#Get the list of bricks for this host and add to dictionary
host['bricks'] = \
- [brick for brick in componentlist
+ [brick for brick in componentlist['bricks']
if brick["hostip"] == host['hostip']]
clusterdata['hosts'] = hostlist
- clusterdata['volumes'] =\
- [volume for volume in componentlist
- if volume["srvctype"] == "volume"]
+ clusterdata['volumes'] = componentlist['volumes']
clusterdata['name'] = args.cluster
return clusterdata