diff options
| author | Michael Scherer <misc@mageia.org> | 2012-03-16 23:58:16 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2012-03-16 23:58:16 +0000 |
| commit | ff471a7f40341a8d65c16fb1dc0395b70230cb36 (patch) | |
| tree | 8ae26dfc9cf60ccc53c4d94bbe7b6f2778fac051 /modules | |
| parent | 017e78e50584f61e6744330da373b42cca6120b1 (diff) | |
| download | puppet-ff471a7f40341a8d65c16fb1dc0395b70230cb36.tar puppet-ff471a7f40341a8d65c16fb1dc0395b70230cb36.tar.gz puppet-ff471a7f40341a8d65c16fb1dc0395b70230cb36.tar.bz2 puppet-ff471a7f40341a8d65c16fb1dc0395b70230cb36.tar.xz puppet-ff471a7f40341a8d65c16fb1dc0395b70230cb36.zip | |
move ssh auth stuff to buildnode rather than iurt class ( as we may reuse the iurt class
for packagers buildhost that would not need the ssh stuff )
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/buildsystem/manifests/buildnode.pp | 4 | ||||
| -rw-r--r-- | modules/buildsystem/manifests/iurt/init.pp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/buildsystem/manifests/buildnode.pp b/modules/buildsystem/manifests/buildnode.pp index f2efa8a3..dd5e6c73 100644 --- a/modules/buildsystem/manifests/buildnode.pp +++ b/modules/buildsystem/manifests/buildnode.pp @@ -1,4 +1,8 @@ class buildsystem::buildnode { include buildsystem::base include buildsystem::iurt + # permit to scheduler to run iurt + ssh::auth::server { $buildsystem::base::sched_login: + user => $buildsystem::iurt::user::login, + } } diff --git a/modules/buildsystem/manifests/iurt/init.pp b/modules/buildsystem/manifests/iurt/init.pp index 9f5780bd..52fdcc02 100644 --- a/modules/buildsystem/manifests/iurt/init.pp +++ b/modules/buildsystem/manifests/iurt/init.pp @@ -7,10 +7,6 @@ class buildsystem::iurt { ssh::auth::client { $login: } - ssh::auth::server { $buildsystem::base::sched_login: - user => $login - } - # remove old build directory tidy { "$homedir/iurt": age => '8w', |