From a760c8df4f4ce29374c3dbb924695e013f58133b Mon Sep 17 00:00:00 2001 From: Nishanth Thomas Date: Fri, 4 Apr 2014 15:17:03 +0530 Subject: 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 Reviewed-on: https://code.engineering.redhat.com/gerrit/22549 Reviewed-by: Kanagaraj Mayilsamy Tested-by: Ramesh Nachimuthu --- plugins/discovery.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'plugins') 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 -- cgit