From: Andrew Schoen Date: Mon, 13 Apr 2015 19:32:18 +0000 (-0500) Subject: Move ssh pubkeys task into ssh.yml. X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5a39aca15e4ce6fd6a14bb919f3e3633401e01cb;p=ceph-cm-ansible.git Move ssh pubkeys task into ssh.yml. This just keeps everything ssh all together in one file. Signed-off-by: Andrew Schoen --- 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