Merge pull request #267 from TimothyAsir/master

Updated scripts to return unique server FQDN using socket library

2 files changed, 1 insertions, 8 deletions

diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py
index 2b353f2a..e7dec088 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py
@@ -36,7 +36,7 @@ from optparse import OptionParser
 
 
 def getServerDetails(listall):
-    serverName = Utils.getServerFqdn()
+    serverName = socket.getfqdn()
     meminfo = getMeminfo()
     cpu = getCpuUsageAvg()
     nameServerList, domain, searchDomain = readResolvConfFile()
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/common/Utils.py b/src/com.gluster.storage.management.gateway.scripts/src/common/Utils.py
index 14988c4d..0b06b5ab 100644
--- a/src/com.gluster.storage.management.gateway.scripts/src/common/Utils.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/common/Utils.py
@@ -452,13 +452,6 @@ def getInfinibandPortStatus():
     return portkeys
         
 
-def getServerFqdn():
-    rv = runCommand("hostname --fqdn", output=True, root=True)
-    if not rv["Stderr"]:
-        return stripEmptyLines(rv["Stdout"])
-    return socket.gethostname()
-
-
 def getServerCount():
     try:
         return int(open(Globals.SERVER_COUNT_FILE).read().strip())