aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--modules/buildsystem/manifests/base.pp5
-rw-r--r--modules/buildsystem/manifests/mainnode.pp4
-rw-r--r--modules/buildsystem/manifests/media_cfg.pp6
-rw-r--r--modules/buildsystem/manifests/mgarepo.pp5
-rw-r--r--modules/buildsystem/manifests/pkgsubmit.pp3
-rw-r--r--modules/buildsystem/manifests/rpmlint.pp3
-rw-r--r--modules/buildsystem/manifests/signbot.pp5
-rw-r--r--modules/buildsystem/manifests/youri_submit.pp5
8 files changed, 22 insertions, 14 deletions
diff --git a/modules/buildsystem/manifests/base.pp b/modules/buildsystem/manifests/base.pp
index 3c5ba655..e93ad7b8 100644
--- a/modules/buildsystem/manifests/base.pp
+++ b/modules/buildsystem/manifests/base.pp
@@ -1,7 +1,8 @@
class buildsystem::base {
+ include buildsystem::scheduler::var
- $sched_login = $buildsystem::scheduler::login
- $sched_home_dir = "/var/lib/$sched_login"
+ $sched_login = $buildsystem::scheduler::var::login
+ $sched_home_dir = $buildsystem::scheduler::var::homedir
$packagers_group = 'mga-packagers'
$packagers_committers_group = 'mga-packagers-committers'
diff --git a/modules/buildsystem/manifests/mainnode.pp b/modules/buildsystem/manifests/mainnode.pp
index 07e052aa..40b94f04 100644
--- a/modules/buildsystem/manifests/mainnode.pp
+++ b/modules/buildsystem/manifests/mainnode.pp
@@ -7,8 +7,8 @@ class buildsystem::mainnode {
include buildsystem::signbot
include buildsystem::youri_submit
- $sched_login = $buildsystem::scheduler::login
- $sched_home_dir = $buildsystem::scheduler::homedir
+ $sched_login = $buildsystem::scheduler::var::login
+ $sched_home_dir = $buildsystem::scheduler::var::homedir
$build_login = $buildsystem::iurt::user::login
diff --git a/modules/buildsystem/manifests/media_cfg.pp b/modules/buildsystem/manifests/media_cfg.pp
index 07d34118..455d4d97 100644
--- a/modules/buildsystem/manifests/media_cfg.pp
+++ b/modules/buildsystem/manifests/media_cfg.pp
@@ -1,11 +1,13 @@
define buildsystem::media_cfg() {
+ include buildsystem::scheduler::var
include buildsystem::repository
+
$arch = $name
+ $sched_login = $buildsystem::scheduler::var::login
+
file { "$buildsystem::repository::root/distrib/cauldron/$arch/media/media_info/media.cfg":
owner => $buildsystem::base::sched_login,
group => $buildsystem::base::sched_login,
source => "puppet:///modules/buildsystem/$arch/media.cfg",
}
}
-
-
diff --git a/modules/buildsystem/manifests/mgarepo.pp b/modules/buildsystem/manifests/mgarepo.pp
index 0866c70c..64f4369a 100644
--- a/modules/buildsystem/manifests/mgarepo.pp
+++ b/modules/buildsystem/manifests/mgarepo.pp
@@ -1,6 +1,7 @@
class buildsystem::mgarepo {
- $sched_home_dir = $buildsystem::base::sched_home_dir
- $sched_login = $buildsystem::base::sched_login
+ include buildsystem::scheduler::var
+ $sched_login = $buildsystem::scheduler::var::login
+ $sched_home_dir = $buildsystem::scheduler::var::homedir
package { ['mgarepo','rpm-build']: }
diff --git a/modules/buildsystem/manifests/pkgsubmit.pp b/modules/buildsystem/manifests/pkgsubmit.pp
index 069fba84..f5500717 100644
--- a/modules/buildsystem/manifests/pkgsubmit.pp
+++ b/modules/buildsystem/manifests/pkgsubmit.pp
@@ -1,4 +1,7 @@
class buildsystem::pkgsubmit {
+ include buildsystem::scheduler::var
+ $sched_home_dir = $buildsystem::scheduler::var::homedir
+
$location = '/var/www/bs'
file { [$location,"$location/data"]:
ensure => directory,
diff --git a/modules/buildsystem/manifests/rpmlint.pp b/modules/buildsystem/manifests/rpmlint.pp
index ea9a55b8..36ddd26e 100644
--- a/modules/buildsystem/manifests/rpmlint.pp
+++ b/modules/buildsystem/manifests/rpmlint.pp
@@ -1,5 +1,6 @@
class buildsystem::rpmlint {
- $sched_login = $buildsystem::base::sched_login
+ include buildsystem::scheduler::var
+ $sched_login = $buildsystem::scheduler::var::login
package { 'rpmlint': }
diff --git a/modules/buildsystem/manifests/signbot.pp b/modules/buildsystem/manifests/signbot.pp
index 266d6cd2..c4967581 100644
--- a/modules/buildsystem/manifests/signbot.pp
+++ b/modules/buildsystem/manifests/signbot.pp
@@ -1,12 +1,11 @@
class buildsystem::signbot {
+ include buildsystem::scheduler::var
$login = 'signbot'
$home_dir = "/var/lib/$login"
$sign_keydir = "$home_dir/keys"
# FIXME: maybe keyid should be defined at an other place
$keyid = '80420F66'
- # FIXME refactor with base class ( once variables are
- # placed in a separate module )
- $sched_login = 'schedbot'
+ $sched_login = $buildsystem::scheduler::var::login
sshuser { $login:
homedir => $home_dir,
diff --git a/modules/buildsystem/manifests/youri_submit.pp b/modules/buildsystem/manifests/youri_submit.pp
index 0616ca85..73a26988 100644
--- a/modules/buildsystem/manifests/youri_submit.pp
+++ b/modules/buildsystem/manifests/youri_submit.pp
@@ -2,10 +2,11 @@ class buildsystem::youri_submit {
include sudo
include buildsystem::rpmlint
include buildsystem::repository
+ include buildsystem::scheduler::var
$repository_root = $buildsystem::repository::dir
- $sched_home_dir = $buildsystem::base::sched_home_dir
- $sched_login = $buildsystem::base::sched_login
+ $sched_home_dir = $buildsystem::scheduler::var::homedir
+ $sched_login = $buildsystem::scheduler::var::login
$packages_archivedir = "$sched_home_dir/old"
local_script {