Remove haveged_service_enable variable

This was added as a workaround because systemd didn't work correctly
on CentOS 7 systems when we originally added this test. This is no
longer the case so remove this workaround and apply systemd ansible
task for CentOS systems as for some reason the "service" task fails
on CentOS systems.

Change-Id: I6deeaec74d78cf1afdd4dbea42a1ff48875f2669
Signed-off-by: Thanh Ha <zxiiro@gmail.com>

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

diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 8b17012..572361f 100644 (file)
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -10,16 +10,10 @@ lint: |
 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
 scenario:
   name: default
 verifier:

diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml
index 5358b3b..36e71a8 100644 (file)
--- a/molecule/default/prepare.yml
+++ b/molecule/default/prepare.yml
@@ -1,5 +1,10 @@
 ---
 - name: Prepare
   hosts: all
-  gather_facts: false
-  tasks: []
+  gather_facts: true
+  tasks:
+    - name: Update APT cache
+      apt:
+        update_cache: yes
+      when: ansible_distribution == 'Ubuntu'
+      become: true

diff --git a/tasks/main.yml b/tasks/main.yml
index 739973e..08a913a 100644 (file)
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -9,6 +9,7 @@
   become: true
 
 - name: Enable haveged service
-  service: name=haveged enabled=yes
-  when: haveged_service_enable | bool
+  systemd:
+    name: haveged
+    enabled: yes
   become: true