From: nicoo <nicoo@realraum.at>
Date: Fri, 8 Jun 2018 19:19:32 +0000 (+0200)
Subject: vm/guest: Ensure no other rngd configuration lines are present
X-Git-Url: https://git.realraum.at/?a=commitdiff_plain;h=73f20ebb5ea2b2626a19f5e8a01ce36d35d64a61;p=noc.git

vm/guest: Ensure no other rngd configuration lines are present
---

diff --git a/ansible/roles/vm/guest/defaults/main.yml b/ansible/roles/vm/guest/defaults/main.yml
new file mode 100644
index 0000000..b4deefa
--- /dev/null
+++ b/ansible/roles/vm/guest/defaults/main.yml
@@ -0,0 +1,3 @@
+rngd_config:
+  HRNGDEVICE: /dev/hwrng
+  RNGDOPTIONS: '"-s 256 -W 80%"'
diff --git a/ansible/roles/vm/guest/tasks/main.yml b/ansible/roles/vm/guest/tasks/main.yml
index 23f4ef4..780a276 100644
--- a/ansible/roles/vm/guest/tasks/main.yml
+++ b/ansible/roles/vm/guest/tasks/main.yml
@@ -3,14 +3,22 @@
     name: rng-tools
     state: present
 
-- name: Configure rngd
+- name: Configure rngd [1/2]
   lineinfile:
     path: /etc/default/rng-tools
     line: '{{ item.key }}={{ item.value }}'
     regexp: '^#?{{ item.key }}={{ item.value }}'
-  with_dict:
-    HRNGDEVICE: /dev/hwrng
-    RNGDOPTIONS: '"-s 256 -W 80%"'
+  with_dict: '{{ rngd_config }}'
+  loop_control:
+    label: "{{ item.key }}"
+  notify: restart rngd
+
+- name: Configure rngd [2/2]
+  lineinfile:
+    path: /etc/default/rng-tools
+    regexp: '^{{ item.key }}=(?!{{ item.value }})'
+    state: absent
+  with_dict: '{{ rngd_config }}'
   loop_control:
     label: "{{ item.key }}"
   notify: restart rngd