From 5a39aca15e4ce6fd6a14bb919f3e3633401e01cb Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Mon, 13 Apr 2015 14:32:18 -0500 Subject: [PATCH] Move ssh pubkeys task into ssh.yml. This just keeps everything ssh all together in one file. Signed-off-by: Andrew Schoen --- roles/testnode/tasks/main.yml | 6 ------ roles/testnode/tasks/ssh.yml | 7 +++++++ roles/testnode/tasks/ssh_pubkeys.yml | 5 ----- 3 files changed, 7 insertions(+), 11 deletions(-) delete mode 100644 roles/testnode/tasks/ssh_pubkeys.yml diff --git a/roles/testnode/tasks/main.yml b/roles/testnode/tasks/main.yml index bbc7af7..d3893df 100644 --- a/roles/testnode/tasks/main.yml +++ b/roles/testnode/tasks/main.yml @@ -56,9 +56,3 @@ - include: pip.yml tags: - pip - -# add SSH pubkeys to authorized_keys -- include: ssh_pubkeys.yml - tags: - - ssh - - pubkeys diff --git a/roles/testnode/tasks/ssh.yml b/roles/testnode/tasks/ssh.yml index 57088a4..f151093 100644 --- a/roles/testnode/tasks/ssh.yml +++ b/roles/testnode/tasks/ssh.yml @@ -16,3 +16,10 @@ owner: root group: root mode: 0755 + +- name: Add ssh pubkeys + authorized_key: + user="{{ teuthology_user }}" + key=https://raw.githubusercontent.com/ceph/keys/autogenerated/ssh/@all.pub + tags: + - pubkeys diff --git a/roles/testnode/tasks/ssh_pubkeys.yml b/roles/testnode/tasks/ssh_pubkeys.yml deleted file mode 100644 index 2579b91..0000000 --- a/roles/testnode/tasks/ssh_pubkeys.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: Add ssh pubkeys - authorized_key: - user="{{ teuthology_user }}" - key=https://raw.githubusercontent.com/ceph/keys/autogenerated/ssh/@all.pub -- 2.39.5