From: Josh Durgin <jdurgin@redhat.com>
Date: Tue, 15 Mar 2016 21:54:53 +0000 (-0700)
Subject: misc: convert skeleton_config to work with clusters in roles
X-Git-Tag: 1.1.0~615^2~18
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=199c93c6fab0da42085b98b5158b147d8d560c7b;p=teuthology.git

misc: convert skeleton_config to work with clusters in roles

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
---

diff --git a/teuthology/misc.py b/teuthology/misc.py
index 59077f00ff..185f53b51d 100644
--- a/teuthology/misc.py
+++ b/teuthology/misc.py
@@ -333,16 +333,19 @@ def skeleton_config(ctx, roles, ips):
     conf = configobj.ConfigObj(StringIO(skconf), file_error=True)
     mons = get_mons(roles=roles, ips=ips)
     for role, addr in mons.iteritems():
-        conf.setdefault(role, {})
-        conf[role]['mon addr'] = addr
+        name = ceph_role(role)
+        conf.setdefault(name, {})
+        conf[name]['mon addr'] = addr
     # set up standby mds's
+    is_mds = is_type('mds', cluster)
     for roles_subset in roles:
         for role in roles_subset:
-            if role.startswith('mds.'):
-                conf.setdefault(role, {})
-                if role.find('-s-') != -1:
-                    standby_mds = role[role.find('-s-') + 3:]
-                    conf[role]['mds standby for name'] = standby_mds
+            if is_mds(role):
+                name = ceph_role(role)
+                conf.setdefault(name, {})
+                if '-s-' in name:
+                    standby_mds = name[name.find('-s-') + 3:]
+                    conf[name]['mds standby for name'] = standby_mds
     return conf