Move ssh configuration to main.yml.

This needs to happen on all distros.

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

diff --git a/roles/testnode/tasks/main.yml b/roles/testnode/tasks/main.yml
index 1398c74cfd950c4de30dae5a556a1d512a77038d..dbe3949d69beb75376533954ea044a1a1fd013bb 100644 (file)
--- a/roles/testnode/tasks/main.yml
+++ b/roles/testnode/tasks/main.yml
@@ -17,6 +17,11 @@
   tags:
     - monitoring-scripts
 
+# configure ssh
+- include: ssh.yml
+  tags:
+    - ssh
+
 # configure things specific to yum systems
 - include: yum_systems.yml
   when: ansible_pkg_mgr == "yum"

diff --git a/roles/testnode/tasks/yum_systems.yml b/roles/testnode/tasks/yum_systems.yml
index df8b68085ad57671a56da1ab8ac913150110f3a1..5745366e093e025c01f6cf5c27db46a426b7c26d 100644 (file)
--- a/roles/testnode/tasks/yum_systems.yml
+++ b/roles/testnode/tasks/yum_systems.yml
@@ -46,11 +46,6 @@
     owner: root
     mode: 0644
 
-- name: Configure ssh
-  include: ssh.yml
-  tags:
-    - ssh
-
 - name: Setup local repo files.
   include: yum/repos.yml
   tags: