summaryrefslogtreecommitdiffstats
path: root/src/com.gluster.storage.management.gateway.scripts
diff options
context:
space:
mode:
authorTim <timothyasir@gluster.com>2011-08-02 11:15:51 +0530
committerTim <timothyasir@gluster.com>2011-08-02 11:15:51 +0530
commitae74f94465f66a4972faa87504aa2e46654b4d96 (patch)
tree0ebb60cb856ad6a683da41655734196dee7656f3 /src/com.gluster.storage.management.gateway.scripts
parentfe3328bc137b7d9aee2481e00f0d80038b320a67 (diff)
Added function to get server fully qualified name.
Diffstat (limited to 'src/com.gluster.storage.management.gateway.scripts')
-rw-r--r--src/com.gluster.storage.management.gateway.scripts/src/Utils.py7
-rwxr-xr-xsrc/com.gluster.storage.management.gateway.scripts/src/get_server_details.py2
2 files changed, 8 insertions, 1 deletions
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()