Move ssh pubkeys task into ssh.yml.

This just keeps everything ssh all together in one file.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/roles/testnode/tasks/main.yml b/roles/testnode/tasks/main.yml
index bbc7af78b5315bac99adcac1fd588aa10b6c97ff..d3893dfc991ed83fbbd125489601390e8e6258a6 100644 (file)
--- 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 57088a47053d095931640f1d0ad2b51466e58669..f151093ee808aa3795dc1f3a7a990e8cf795fe81 100644 (file)
--- 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 (file)
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