From 1bf4cfab2e28783ebea05e15e88b0769ca7b0f03 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Fri, 16 Mar 2012 22:46:57 +0000 Subject: install the binary in scheduler and gatherer class, not in main node --- modules/buildsystem/manifests/gatherer.pp | 3 ++- modules/buildsystem/manifests/mainnode.pp | 5 ----- modules/buildsystem/manifests/scheduler.pp | 3 ++- 3 files changed, 4 insertions(+), 7 deletions(-) (limited to 'modules/buildsystem/manifests') diff --git a/modules/buildsystem/manifests/gatherer.pp b/modules/buildsystem/manifests/gatherer.pp index 02287717..e0a18222 100644 --- a/modules/buildsystem/manifests/gatherer.pp +++ b/modules/buildsystem/manifests/gatherer.pp @@ -1,4 +1,5 @@ class buildsystem::gatherer { - # that's emi + # emi is in main iurt rpm, should be moved out + include iurt::package include iurt::upload } diff --git a/modules/buildsystem/manifests/mainnode.pp b/modules/buildsystem/manifests/mainnode.pp index fac95039..26755d96 100644 --- a/modules/buildsystem/manifests/mainnode.pp +++ b/modules/buildsystem/manifests/mainnode.pp @@ -21,11 +21,6 @@ class buildsystem::mainnode { ssh::auth::server { [$sched_login, $build_login]: } - # FIXME Add again task-bs-cluster-main when it will require - # mgarepo instead of repsys - $package_list = ['iurt'] - package { $package_list: } - $mirror_root = '/distrib/mirror' apache::vhost_other_app { "repository.$::domain": vhost_file => 'buildsystem/vhost_repository.conf', diff --git a/modules/buildsystem/manifests/scheduler.pp b/modules/buildsystem/manifests/scheduler.pp index 296c184e..1b3d32d5 100644 --- a/modules/buildsystem/manifests/scheduler.pp +++ b/modules/buildsystem/manifests/scheduler.pp @@ -1,4 +1,5 @@ class buildsystem::scheduler { - # ulri + # until ulri is splitted from main iurt rpm + include iurt::package include iurt::upload } -- cgit v1.2.1