Allow skipping enabling of the haveged service

Docker containers which don't contain a services manager (ala
systemd) will fail on  service tasks. Adding a variable to skip the
service tasks allows the role to be ran and tested in containers.

Change-Id: I19945ad5344979feee21b76579beb5b7d02e2f4f
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>

diff --git a/defaults/main.yml b/defaults/main.yml
index 914062b..587b690 100644 (file)
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,2 +1,2 @@
 ---
-# defaults file for haveged-install
+haveged_service_enable: true

diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 983dac9..af9a52e 100644 (file)
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -6,10 +6,18 @@ driver:
 lint:
   name: yamllint
 platforms:
+  - name: centos7
+    image: centos:7
+    groups:
+      - centos
   - name: ubuntu1604
     image: ubuntu:16.04
 provisioner:
   name: ansible
+  inventory:
+    group_vars:
+      centos:
+        haveged_service_enable: false
   lint:
     name: ansible-lint
 scenario:

diff --git a/tasks/main.yml b/tasks/main.yml
index 3cde6d9..097d271 100644 (file)
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,8 +1,13 @@
 ---
+- name: Install Epel Repo
+  package: name=epel-release state=present
+  when: ansible_os_family == "RedHat"
+
 - name: Install haveged package
   package: name=haveged state=present
   become: true
 
 - name: Enable haveged service
   service: name=haveged enabled=yes
+  when: haveged_service_enable
   become: true

diff --git a/tox.ini b/tox.ini
index fe04556..df46764 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -18,7 +18,7 @@ commands =
 basepython = python2
 deps =
     ansible
-    docker-py
+    docker
     molecule
 passenv = *
 commands =