diff --git a/system/gluster_volume.py b/system/gluster_volume.py
index 2ea6b974adc..c5d852731c5 100644
--- a/system/gluster_volume.py
+++ b/system/gluster_volume.py
@@ -256,6 +256,7 @@ def probe(host, myhostname):
 
 def probe_all_peers(hosts, peers, myhostname):
     for host in hosts:
+        host = host.strip() # Clean up any extra space for exact comparison
         if host not in peers:
             # dont probe ourselves
             if myhostname != host:
@@ -347,6 +348,11 @@ def main():
     if not myhostname:
         myhostname = socket.gethostname()
 
+    # Clean up if last element is empty. Consider that yml can look like this:
+    #   cluster="{% for host in groups['glusterfs'] %}{{ hostvars[host]['private_ip'] }},{% endfor %}"
+    if cluster != None and cluster[-1] == '':
+        cluster = cluster[0:-1]
+
     if brick_paths != None and "," in brick_paths:
         brick_paths = brick_paths.split(",")
     else: