Made the ssh service name pkg mgr system dependent.

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

diff --git a/roles/testnode/handlers/main.yml b/roles/testnode/handlers/main.yml
index 5776a50daff153e85b59924a4ed3c736a29b68b4..05d73f71087f42f151c0579b7709254c55d4b6c5 100644 (file)
--- a/roles/testnode/handlers/main.yml
+++ b/roles/testnode/handlers/main.yml
@@ -4,9 +4,9 @@
     name: "{{ ntp_service_name }}" 
     state: restarted
 
-- name: restart sshd
+- name: restart ssh
   service:
-    name: sshd
+    name: "{{ ssh_service_name }}"
     state: restarted
 
 - name: start nfs-server

diff --git a/roles/testnode/tasks/ssh.yml b/roles/testnode/tasks/ssh.yml
index 3bf4cdd3a7e079870b7132357d128770cf408c9b..57088a47053d095931640f1d0ad2b51466e58669 100644 (file)
--- a/roles/testnode/tasks/ssh.yml
+++ b/roles/testnode/tasks/ssh.yml
@@ -7,9 +7,7 @@
     group: root
     mode: 0755
   notify:
-    - restart sshd
-  tags:
-    - ssh
+    - restart ssh
 
 - name: Upload ssh_config.
   template:
@@ -18,5 +16,3 @@
     owner: root
     group: root
     mode: 0755
-  tags:
-    - ssh

diff --git a/roles/testnode/vars/apt_systems.yml b/roles/testnode/vars/apt_systems.yml
index ddfe3daf9af1440fdc0c16d74576ad004049d094..c78e93d935f142a4e32ceddabbde6089c41698a7 100644 (file)
--- a/roles/testnode/vars/apt_systems.yml
+++ b/roles/testnode/vars/apt_systems.yml
@@ -1,5 +1,6 @@
 ---
 ntp_service_name: ntp
+ssh_service_name: ssh
 
 ceph_packages:
   - ceph

diff --git a/roles/testnode/vars/yum_systems.yml b/roles/testnode/vars/yum_systems.yml
index b4576aa68e9c4ed489ad31b88008fbb701a876c8..f5aaf8d2d1cd6e6fbcc03d95d121f4592680a013 100644 (file)
--- a/roles/testnode/vars/yum_systems.yml
+++ b/roles/testnode/vars/yum_systems.yml
@@ -1,5 +1,6 @@
 ---
 ntp_service_name: ntpd
+ssh_service_name: sshd
 
 # ceph packages that we ensure do not exist
 ceph_packages: