ceph: don't skip monitor ports

We can use the same port multiple times if they are on a different hosts.

diff --git a/teuthology/misc.py b/teuthology/misc.py
index 720b115fc3204d3627fbfbaec439525554437b67..00c674f5e2425aec56b02bf1694506c02de9ab61 100644 (file)
--- a/teuthology/misc.py
+++ b/teuthology/misc.py
@@ -66,14 +66,19 @@ def feed_many_stdins_and_close(fp, processes):
 
 def get_mons(roles, ips):
     mons = {}
+    mon_ports = {}
     mon_id = 0
     for idx, roles in enumerate(roles):
         for role in roles:
             if not role.startswith('mon.'):
                 continue
+            if ips[idx] not in mon_ports:
+                mon_ports[ips[idx]] = 6789
+            else:
+                mon_ports[ips[idx]] += 1
             addr = '{ip}:{port}'.format(
                 ip=ips[idx],
-                port=6789+mon_id,
+                port=mon_ports[ips[idx]],
                 )
             mon_id += 1
             mons[role] = addr