From 7c4efc1c5efbeb2589f5fbd34f58670d93de4d66 Mon Sep 17 00:00:00 2001 From: Nicolas Vigier Date: Thu, 23 May 2013 15:06:59 +0000 Subject: Use sshkeys module instead of auth::ssh The sshkeys module is easier to understand, and will allow us to install the same ssh key on 2 different accounts. --- modules/buildsystem/manifests/buildnode.pp | 5 +++-- modules/buildsystem/manifests/mainnode.pp | 5 ++++- modules/buildsystem/manifests/sshkeys.pp | 5 +---- 3 files changed, 8 insertions(+), 7 deletions(-) (limited to 'modules') diff --git a/modules/buildsystem/manifests/buildnode.pp b/modules/buildsystem/manifests/buildnode.pp index 56230f68..997dba2f 100644 --- a/modules/buildsystem/manifests/buildnode.pp +++ b/modules/buildsystem/manifests/buildnode.pp @@ -4,8 +4,9 @@ class buildsystem::buildnode { include buildsystem::var::iurt include buildsystem::sshkeys - # permit to scheduler to run iurt - ssh::auth::server { $buildsystem::var::scheduler::login: + sshkeys::set_authorized_keys { 'iurt-allow-scheduler': + keyname => $buildsystem::var::scheduler::login, + home => $buildsystem::var::iurt::homedir, user => $buildsystem::var::iurt::login, } } diff --git a/modules/buildsystem/manifests/mainnode.pp b/modules/buildsystem/manifests/mainnode.pp index 37c09f35..7166786a 100644 --- a/modules/buildsystem/manifests/mainnode.pp +++ b/modules/buildsystem/manifests/mainnode.pp @@ -9,5 +9,8 @@ class buildsystem::mainnode { include buildsystem::sshkeys include buildsystem::distros - ssh::auth::client { $buildsystem::var::scheduler::login: } + sshkeys::set_client_key_pair { $buildsystem::var::scheduler::login: + home => $buildsystem::var::scheduler::homedir, + user => $buildsystem::var::scheduler::login, + } } diff --git a/modules/buildsystem/manifests/sshkeys.pp b/modules/buildsystem/manifests/sshkeys.pp index 6f5bba64..5a1b2900 100644 --- a/modules/buildsystem/manifests/sshkeys.pp +++ b/modules/buildsystem/manifests/sshkeys.pp @@ -1,8 +1,5 @@ class buildsystem::sshkeys { - include ssh::auth include buildsystem::var::scheduler - ssh::auth::key { $buildsystem::var::scheduler::login: - home => $buildsystem::var::scheduler::homedir, - } + sshkeys::create_key { $buildsystem::var::scheduler::login: } } -- cgit v1.2.1