diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2012-08-31 17:28:27 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2012-08-31 17:28:27 +0000 |
| commit | 82d2d6c17a79cab637f257dbf5fda59056615439 (patch) | |
| tree | 8ec484c2f3ba45c3399fc439d2c3e422ff9f07fd /modules/buildsystem | |
| parent | c11190e6562d30c0c8beb78eb947ff94346cf7ee (diff) | |
| download | puppet-82d2d6c17a79cab637f257dbf5fda59056615439.tar puppet-82d2d6c17a79cab637f257dbf5fda59056615439.tar.gz puppet-82d2d6c17a79cab637f257dbf5fda59056615439.tar.bz2 puppet-82d2d6c17a79cab637f257dbf5fda59056615439.tar.xz puppet-82d2d6c17a79cab637f257dbf5fda59056615439.zip | |
add buildsystem::sshkeys class to define all ssh keys
Diffstat (limited to 'modules/buildsystem')
| -rw-r--r-- | modules/buildsystem/manifests/buildnode.pp | 5 | ||||
| -rw-r--r-- | modules/buildsystem/manifests/mainnode.pp | 1 | ||||
| -rw-r--r-- | modules/buildsystem/manifests/sshkeys.pp | 12 | ||||
| -rw-r--r-- | modules/buildsystem/manifests/sshuser.pp | 5 |
4 files changed, 14 insertions, 9 deletions
diff --git a/modules/buildsystem/manifests/buildnode.pp b/modules/buildsystem/manifests/buildnode.pp index ce80376e..bf898f32 100644 --- a/modules/buildsystem/manifests/buildnode.pp +++ b/modules/buildsystem/manifests/buildnode.pp @@ -2,11 +2,8 @@ class buildsystem::buildnode { include buildsystem::base include buildsystem::iurt include buildsystem::scheduler::var + include buildsystem::sshkeys - ssh::auth::key { $buildsystem::scheduler::var::login: - home => $buildsystem::scheduler::var::homedir, - - } # permit to scheduler to run iurt ssh::auth::server { $buildsystem::scheduler::var::login: user => $buildsystem::iurt::user::login, diff --git a/modules/buildsystem/manifests/mainnode.pp b/modules/buildsystem/manifests/mainnode.pp index 5dc9546a..45dff1dd 100644 --- a/modules/buildsystem/manifests/mainnode.pp +++ b/modules/buildsystem/manifests/mainnode.pp @@ -6,6 +6,7 @@ class buildsystem::mainnode { include buildsystem::mgarepo include buildsystem::signbot include buildsystem::youri_submit + include buildsystem::sshkeys $sched_login = $buildsystem::scheduler::var::login $sched_home_dir = $buildsystem::scheduler::var::homedir diff --git a/modules/buildsystem/manifests/sshkeys.pp b/modules/buildsystem/manifests/sshkeys.pp new file mode 100644 index 00000000..6161e38d --- /dev/null +++ b/modules/buildsystem/manifests/sshkeys.pp @@ -0,0 +1,12 @@ +class buildsystem::sshkeys { + include $buildsystem::scheduler::var + include $buildsystem::iurt::user + + ssh::auth::key { $buildsystem::scheduler::var::login: + home => $buildsystem::scheduler::var::homedir, + } + + ssh::auth::key { $buildsystem::iurt::user::login: + home => $buildsystem::iurt::user::homedir + } +} diff --git a/modules/buildsystem/manifests/sshuser.pp b/modules/buildsystem/manifests/sshuser.pp index 299b0dfc..0a1cd176 100644 --- a/modules/buildsystem/manifests/sshuser.pp +++ b/modules/buildsystem/manifests/sshuser.pp @@ -33,9 +33,4 @@ define buildsystem::sshuser($homedir, $comment, $groups = []) { group => $name, require => File[$homedir], } - - ssh::auth::key { $name: - # declare a key for sched bot: RSA, 2048 bits - home => $homedir, - } } |