From 5cd97b47b6cc63247ac4981ca17199d02cc4914a Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Fri, 16 Mar 2012 22:46:59 +0000
Subject: move sched_login creation to the scheduler class ( since that's where
 it belong logically )

---
 modules/buildsystem/manifests/mainnode.pp  | 10 +++-------
 modules/buildsystem/manifests/scheduler.pp |  7 +++++++
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'modules/buildsystem/manifests')

diff --git a/modules/buildsystem/manifests/mainnode.pp b/modules/buildsystem/manifests/mainnode.pp
index 26755d96..b33ebfa5 100644
--- a/modules/buildsystem/manifests/mainnode.pp
+++ b/modules/buildsystem/manifests/mainnode.pp
@@ -7,16 +7,12 @@ class buildsystem::mainnode {
     include buildsystem::signbot
     include buildsystem::youri_submit
 
-    $sched_login = $buildsystem::base::sched_login
-    $sched_home_dir = $buildsystem::base::sched_home_dir
+    $sched_login    = $buildsystem::scheduler::login
+    $sched_home_dir = $buildsystem::scheduler::homedir
+
     $build_login = $buildsystem::iurt::user::login
     $repository_root = $buildsystem::base::repository_root
 
-    sshuser { $sched_login:
-        homedir => $sched_home_dir,
-        comment => 'System user used to schedule builds',
-    }
-
     ssh::auth::client { $sched_login: }
 
     ssh::auth::server { [$sched_login, $build_login]: }
diff --git a/modules/buildsystem/manifests/scheduler.pp b/modules/buildsystem/manifests/scheduler.pp
index 1b3d32d5..bf4709c3 100644
--- a/modules/buildsystem/manifests/scheduler.pp
+++ b/modules/buildsystem/manifests/scheduler.pp
@@ -2,4 +2,11 @@ class buildsystem::scheduler {
         # until ulri is splitted from main iurt rpm
         include iurt::package
         include iurt::upload
+        $login = $buildsystem::base::sched_login
+        $homedir = $buildsystem::base::sched_home_dir
+
+        sshuser { $login:
+            homedir => $homedir,
+            comment => 'System user used to schedule builds',
+        }
 }
-- 
cgit v1.2.1