From ae74f94465f66a4972faa87504aa2e46654b4d96 Mon Sep 17 00:00:00 2001
From: Tim <timothyasir@gluster.com>
Date: Tue, 2 Aug 2011 11:15:51 +0530
Subject: Added function to get server fully qualified name.

---
 src/com.gluster.storage.management.gateway.scripts/src/Utils.py    | 7 +++++++
 .../src/get_server_details.py                                      | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/com.gluster.storage.management.gateway.scripts/src/Utils.py b/src/com.gluster.storage.management.gateway.scripts/src/Utils.py
index 3408c14a..391a2bb3 100644
--- a/src/com.gluster.storage.management.gateway.scripts/src/Utils.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/Utils.py
@@ -442,6 +442,13 @@ 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())
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/get_server_details.py b/src/com.gluster.storage.management.gateway.scripts/src/get_server_details.py
index 9c3da741..ba735892 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/get_server_details.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/get_server_details.py
@@ -28,7 +28,7 @@ from optparse import OptionParser
 
 
 def getServerDetails(listall):
-    serverName = socket.gethostname()
+    serverName = Utils.getServerFqdn()
     meminfo = getMeminfo()
     cpu = getCpuUsageAvg()
     nameServerList, domain, searchDomain = readResolvConfFile()
-- 
cgit