buildsystem: rename scheduler::var to var::scheduler

10 files changed, 23 insertions, 23 deletions

diff --git a/modules/buildsystem/manifests/buildnode.pp b/modules/buildsystem/manifests/buildnode.pp
index bf898f32..3085a513 100644
--- a/modules/buildsystem/manifests/buildnode.pp
+++ b/modules/buildsystem/manifests/buildnode.pp
@@ -1,11 +1,11 @@
 class buildsystem::buildnode {
     include buildsystem::base
     include buildsystem::iurt
-    include buildsystem::scheduler::var
+    include buildsystem::var::scheduler
     include buildsystem::sshkeys
 
     # permit to scheduler to run iurt
-    ssh::auth::server { $buildsystem::scheduler::var::login:
+    ssh::auth::server { $buildsystem::var::scheduler::login:
         user => $buildsystem::iurt::user::login,
     }
 }
diff --git a/modules/buildsystem/manifests/mainnode.pp b/modules/buildsystem/manifests/mainnode.pp
index 45dff1dd..c3002086 100644
--- a/modules/buildsystem/manifests/mainnode.pp
+++ b/modules/buildsystem/manifests/mainnode.pp
@@ -8,8 +8,8 @@ class buildsystem::mainnode {
     include buildsystem::youri_submit
     include buildsystem::sshkeys
 
-    $sched_login    = $buildsystem::scheduler::var::login
-    $sched_home_dir = $buildsystem::scheduler::var::homedir
+    $sched_login    = $buildsystem::var::scheduler::login
+    $sched_home_dir = $buildsystem::var::scheduler::homedir
 
     $build_login = $buildsystem::iurt::user::login
 
diff --git a/modules/buildsystem/manifests/media_cfg.pp b/modules/buildsystem/manifests/media_cfg.pp
index c6de0d35..5418e5d8 100644
--- a/modules/buildsystem/manifests/media_cfg.pp
+++ b/modules/buildsystem/manifests/media_cfg.pp
@@ -1,5 +1,5 @@
 define buildsystem::media_cfg($distro, $arch, $templatefile = 'buildsystem/media.cfg') {
-    include buildsystem::scheduler::var
+    include buildsystem::var::scheduler
     include buildsystem::repository
     
     file { "${buildsystem::repository::dir}/distrib/${distro}/${arch}/media/media_info/media.cfg":
diff --git a/modules/buildsystem/manifests/mgarepo.pp b/modules/buildsystem/manifests/mgarepo.pp
index 70b71202..9108c265 100644
--- a/modules/buildsystem/manifests/mgarepo.pp
+++ b/modules/buildsystem/manifests/mgarepo.pp
@@ -1,7 +1,7 @@
 class buildsystem::mgarepo {
-    include buildsystem::scheduler::var
-    $sched_login = $buildsystem::scheduler::var::login
-    $sched_home_dir = $buildsystem::scheduler::var::homedir
+    include buildsystem::var::scheduler
+    $sched_login = $buildsystem::var::scheduler::login
+    $sched_home_dir = $buildsystem::var::scheduler::homedir
 
     package { ['mgarepo','rpm-build']: }
 
diff --git a/modules/buildsystem/manifests/pkgsubmit.pp b/modules/buildsystem/manifests/pkgsubmit.pp
index ba575cd2..7ed9d39e 100644
--- a/modules/buildsystem/manifests/pkgsubmit.pp
+++ b/modules/buildsystem/manifests/pkgsubmit.pp
@@ -1,6 +1,6 @@
 class buildsystem::pkgsubmit {
-    include buildsystem::scheduler::var
-    $sched_home_dir = $buildsystem::scheduler::var::homedir
+    include buildsystem::var::scheduler
+    $sched_home_dir = $buildsystem::var::scheduler::homedir
 
     $location = '/var/www/bs'
     file { [$location,"$location/data"]:
diff --git a/modules/buildsystem/manifests/scheduler.pp b/modules/buildsystem/manifests/scheduler.pp
index 6facc8e9..63eb7af5 100644
--- a/modules/buildsystem/manifests/scheduler.pp
+++ b/modules/buildsystem/manifests/scheduler.pp
@@ -3,11 +3,11 @@ class buildsystem::scheduler {
         include ssh::auth
         include buildsystem::iurt::packages
         include buildsystem::iurt::upload
-        include buildsystem::scheduler::var
+        include buildsystem::var::scheduler
 
-        $login = $buildsystem::scheduler::var::login
-        $homedir = $buildsystem::scheduler::var::homedir        
-	$logdir = $buildsystem::scheduler::var::logdir
+        $login = $buildsystem::var::scheduler::login
+        $homedir = $buildsystem::var::scheduler::homedir        
+	$logdir = $buildsystem::var::scheduler::logdir
 
         buildsystem::sshuser { $login:
             homedir => $homedir,
diff --git a/modules/buildsystem/manifests/signbot.pp b/modules/buildsystem/manifests/signbot.pp
index 2aafee76..95e9f1d2 100644
--- a/modules/buildsystem/manifests/signbot.pp
+++ b/modules/buildsystem/manifests/signbot.pp
@@ -1,7 +1,7 @@
 class buildsystem::signbot {
-    include buildsystem::scheduler::var
+    include buildsystem::var::scheduler
     include buildsystem::var::signbot
-    $sched_login = $buildsystem::scheduler::var::login
+    $sched_login = $buildsystem::var::scheduler::login
 
     sshuser { $buildsystem::var::signbot::login:
         homedir => $buildsystem::var::signbot::home_dir,
diff --git a/modules/buildsystem/manifests/sshkeys.pp b/modules/buildsystem/manifests/sshkeys.pp
index bea2959f..a3f4a41c 100644
--- a/modules/buildsystem/manifests/sshkeys.pp
+++ b/modules/buildsystem/manifests/sshkeys.pp
@@ -1,10 +1,10 @@
 class buildsystem::sshkeys {
     include ssh::auth
-    include buildsystem::scheduler::var
+    include buildsystem::var::scheduler
     include buildsystem::iurt::user
 
-    ssh::auth::key { $buildsystem::scheduler::var::login:
-	home => $buildsystem::scheduler::var::homedir,
+    ssh::auth::key { $buildsystem::var::scheduler::login:
+	home => $buildsystem::var::scheduler::homedir,
     }
 
     ssh::auth::key { $buildsystem::iurt::user::login:
diff --git a/modules/buildsystem/manifests/scheduler/var.pp b/modules/buildsystem/manifests/var/scheduler.pp
index e89ef634..47933b0b 100644
--- a/modules/buildsystem/manifests/scheduler/var.pp
+++ b/modules/buildsystem/manifests/var/scheduler.pp
@@ -1,4 +1,4 @@
-class buildsystem::scheduler::var {
+class buildsystem::var::scheduler {
     $login = 'schedbot'
     $homedir = "/var/lib/$login"
     $logdir = "/var/log/$login"
diff --git a/modules/buildsystem/manifests/youri_submit.pp b/modules/buildsystem/manifests/youri_submit.pp
index dfbb3a34..5a70b1c4 100644
--- a/modules/buildsystem/manifests/youri_submit.pp
+++ b/modules/buildsystem/manifests/youri_submit.pp
@@ -2,11 +2,11 @@ class buildsystem::youri_submit {
     include sudo
     include buildsystem::rpmlint
     include buildsystem::repository
-    include buildsystem::scheduler::var
+    include buildsystem::var::scheduler
 
     $repository_root = $buildsystem::repository::dir
-    $sched_home_dir = $buildsystem::scheduler::var::homedir
-    $sched_login = $buildsystem::scheduler::var::login
+    $sched_home_dir = $buildsystem::var::scheduler::homedir
+    $sched_login = $buildsystem::var::scheduler::login
     $packages_archivedir = "$sched_home_dir/old"
 
     mga-common::local_script {