roles.py: support nested roles + cli invocation

- walk both pillar and salt roles
- support nested roles / state files in subdirectories
- allow test invocation of the script from the command line

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>

bin/roles.py

@@ -6,8 +6,13 @@ roles = []
 excluded = ['common-suse', 'minion']
 
 def get():
-    for file in os.listdir('salt/role'):
+    for root in ['pillar', 'salt']:
-        role = os.path.splitext(file)[0]
+        for rootdir, subdirs, files in os.walk(os.path.join(root, 'role')):
-        if not role in excluded:
+            for file in files:
-            roles.append(role)
+                role = os.path.splitext(file)[0]
+                if not role in excluded and not role in roles:
+                    roles.append(role)
     return roles
+
+if __name__ == '__main__':
+    print(get())