Make ybd+rpm generate rpms for every system in a cluster

2 files changed, 10 insertions, 7 deletions

diff --git a/ybd/__main__.py b/ybd/__main__.py
index e86b75c..52fd9f0 100755
--- a/ybd/__main__.py
+++ b/ybd/__main__.py
@@ -124,7 +124,16 @@ with timer('TOTAL'):
             os._exit(1)
 
     if config.get('generate-rpms', False) is True:
-        package_rpms(target)
+        if target['kind'] == 'system':
+            package_rpms(target)
+        elif target['kind'] == 'cluster':
+            # call package_rpms for each system in the cluster
+            for system in target['systems']:
+                package_rpms(system['path'])
+        else:
+            log('RPM',
+                ('%s is a %s, cannot package rpms!'
+                 % (target['name'], target['kind'])))
 
     if config.get('reproduce'):
         log('REPRODUCED',
diff --git a/ybd/rpm.py b/ybd/rpm.py
index d58fb2f..585000c 100644
--- a/ybd/rpm.py
+++ b/ybd/rpm.py
@@ -203,12 +203,6 @@ def package_rpms(system):
     if type(system) is not dict:
         system = app.defs.get(system)
 
-    system_kind = system.get('kind')
-    if system_kind != 'system':
-        log('RPM',
-            '%s is not a system, cannot package rpms !' % system.get('name'),
-            exit=True)
-
     with sandbox.setup(system):
         install_contents(system)