Merge pull request alphagov#151 from alphagov/specifying-multiple-classes

timmow · timmow · commit c5311c896f23 · 2015-08-19T12:02:38.000+01:00
Allow specifying multiple classes at the same time
diff --git a/README.md b/README.md
@@ -35,6 +35,7 @@ And execute against an environment and set of hosts like so:
     $ fab preview all hosts
     ...
     $ fab preview class:frontend do:'uname -a'
+    $ fab preview class:cache,bouncer do:uptime
     ...
 
 ### Targetting groups of machines
diff --git a/fabfile.py b/fabfile.py
@@ -263,9 +263,10 @@ def numbered(number):
     env.hosts = [host for host in env.hosts if re.search((r'-%s\.' % number), host)]
 
 @task(name='class')
-def klass(class_name):
+def klass(*class_names):
     """Select a machine class"""
-    env.hosts.extend(env.roledefs['class-%s' % class_name]())
+    for class_name in class_names:
+        env.hosts.extend(env.roledefs['class-%s' % class_name]())
 
 @task
 @serial
