From 27f5e529423650ea4bc2600dcf1a5fa50ef2c589 Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Fri, 16 Mar 2012 23:11:27 +0000
Subject: move key declaration of scheduler to the scheduler class

---
 modules/buildsystem/manifests/base.pp      | 6 +-----
 modules/buildsystem/manifests/scheduler.pp | 8 +++++++-
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'modules')

diff --git a/modules/buildsystem/manifests/base.pp b/modules/buildsystem/manifests/base.pp
index 05adc53c..3c5ba655 100644
--- a/modules/buildsystem/manifests/base.pp
+++ b/modules/buildsystem/manifests/base.pp
@@ -1,6 +1,6 @@
 class buildsystem::base {
 
-    $sched_login = 'schedbot'
+    $sched_login = $buildsystem::scheduler::login
     $sched_home_dir = "/var/lib/$sched_login"
 
     $packagers_group = 'mga-packagers'
@@ -12,8 +12,4 @@ class buildsystem::base {
         home => $buildsystem::iurt::user::homedir,
     }
 
-    ssh::auth::key { $sched_login:
-        # declare a key for sched bot: RSA, 2048 bits
-        home => $sched_home_dir,
-    }
 }
diff --git a/modules/buildsystem/manifests/scheduler.pp b/modules/buildsystem/manifests/scheduler.pp
index b1730103..887c2120 100644
--- a/modules/buildsystem/manifests/scheduler.pp
+++ b/modules/buildsystem/manifests/scheduler.pp
@@ -1,10 +1,16 @@
 class buildsystem::scheduler {
         # until ulri is splitted from main iurt rpm
+        include ssh::auth
         include iurt::packages
         include iurt::upload
-        $login = $buildsystem::base::sched_login
+        $login = 'schedbot'
         $homedir = $buildsystem::base::sched_home_dir
 
+        ssh::auth::key { $login:
+            # declare a key for sched bot: RSA, 2048 bits
+            home => $sched_home_dir,
+        }
+
         sshuser { $login:
             homedir => $homedir,
             comment => 'System user used to schedule builds',
-- 
cgit v1.2.1