refactored system manager check to use os/version instead of automatically detecting (seems to be not so trivial)

Author: MassiveHiggsField

defaults/main.yml

@@ -6,4 +6,6 @@ selenium_server_download:           "http://selenium-release.storage.googleapis.
 
 selenium_geckodriver_version:       0.11.1
 selenium_geckodriver_dir:           /usr/local/bin
-selenium_geckodriver_download:      "https://github.com/mozilla/geckodriver/releases/download/v{{ selenium_geckodriver_version }}/geckodriver-v{{ selenium_geckodriver_version }}-linux64.tar.gz"
+selenium_geckodriver_download:      "https://github.com/mozilla/geckodriver/releases/download/v{{ selenium_geckodriver_version }}/geckodriver-v{{ selenium_geckodriver_version }}-linux64.tar.gz"
+
+selenium_system_manager:            systemd

meta/main.yml

@@ -21,6 +21,7 @@ galaxy_info:
   categories:
   - web
 dependencies:
+  #- role: cmprescott.chrome
   - src: https://github.com/MassiveHiggsField/ansible-role-java/archive/master.tar.gz
     name: MassiveHiggsField.ansible-role-java
     java_packages:

tasks/selenium.yml

@@ -34,11 +34,13 @@
     group: root
     mode: 0755
 
-- name: Check system manager
-  shell: 'stat /proc/1/exe -c " File: %N" | grep systemv > /dev/null && printf "systemd" || printf "sysv"'
-  #shell: pidof systemd > /dev/null && printf "systemd" || printf "sysv"
-  register: selenium_system_manager
-  changed_when: False
+- set_fact:
+    selenium_system_manager: sysv
+  when: ansible_os_family == 'RedHat' and ansible_distribution_version[0:1] == '6'
+
+- set_fact:
+    selenium_system_manager: sysv
+  when: ansible_os_family == 'Ubuntu' and ansible_distribution_version[0:4] != '16.04'
 
 ######################################################################
 ###############             SYSV INIT                 ################
@@ -62,7 +64,7 @@
   - name: Ensure selenium service is running via ps
     shell: ps -ef |  grep "/bin/sh /usr/bin/xvfb-run /usr/bin/java -client -jar" | grep -v grep
     changed_when: False
-  when: selenium_system_manager.stdout == 'sysv'
+  when: selenium_system_manager == 'sysv'
   tags: [test]
 
 #######################################################################
@@ -80,4 +82,4 @@
 
   - name: Ensure selenium service is running via systemd
     service: name=selenium state=started enabled=yes
-  when: selenium_system_manager.stdout == 'systemd'
+  when: selenium_system_manager == 'systemd'

tests/check_install.yml

@@ -23,7 +23,7 @@
 - block:
   - name: Pause cause i did not find a good way to wait for server to be running with systemd unit files
     pause: seconds=10
-    when: selenium_system_manager.stdout == 'systemd'
+    when: selenium_system_manager == 'systemd'
     tags: [test]
 
   - name: Test selenium server response
@@ -33,12 +33,12 @@
 
   - name: Test restart selenium server for sysv
     shell: /etc/init.d/selenium restart
-    when: selenium_system_manager.stdout == 'sysv'
+    when: selenium_system_manager == 'sysv'
     tags: [test]
 
   - name: Pause cause i did not find a good way to wait for server to be running with systemd unit files
     pause: seconds=10
-    when: selenium_system_manager.stdout == 'systemd'
+    when: selenium_system_manager == 'systemd'
     tags: [test]
 
   - name: Test selenium server response again
@@ -62,11 +62,11 @@
 
   - name: Get service status via systemd
     shell: service selenium status
-    when: selenium_system_manager.stdout == 'systemd'
+    when: selenium_system_manager == 'systemd'
     register: result_service
 
   - debug: var=result_service.stdout_lines verbosity=0
-    when: selenium_system_manager.stdout == 'systemd'
+    when: selenium_system_manager == 'systemd'
 
   - name: Get ps output
     shell: ps -x