From: Andrew Schoen <aschoen@redhat.com>
Date: Mon, 13 Apr 2015 19:11:22 +0000 (-0500)
Subject: Move ssh configuration to main.yml.
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4b122eb844d7e08d04475f609def4788064b9698;p=ceph-cm-ansible.git

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 1398c74..dbe3949 100644
--- 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 df8b680..5745366 100644
--- 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: