From c29d6548c2cdce97793fb0bac7ef4f9071358783 Mon Sep 17 00:00:00 2001
From: Stewart X Addison <6487691+sxa@users.noreply.github.com>
Date: Fri, 29 Sep 2023 10:22:27 +0000
Subject: [PATCH] Revert "unixPB: Install rng-tools to fix low entropy (#3145)"
 (#3200)

This reverts commit a2989df3139c005a1e7400b7b746fe5826ee0fa5.
---
 .../AdoptOpenJDK_Unix_Playbook/main.yml       |  1 -
 .../roles/rngd/tasks/fedora.yml               | 19 ----------------
 .../roles/rngd/tasks/main.yml                 | 22 -------------------
 .../roles/rngd/tasks/sles.yml                 | 19 ----------------
 .../roles/rngd/tasks/ubuntu.yml               | 19 ----------------
 5 files changed, 80 deletions(-)
 delete mode 100644 ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/rngd/tasks/fedora.yml
 delete mode 100644 ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/rngd/tasks/main.yml
 delete mode 100644 ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/rngd/tasks/sles.yml
 delete mode 100644 ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/rngd/tasks/ubuntu.yml

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml
index fca1f997f6..7ac31394a2 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml
@@ -141,4 +141,3 @@
     - role: logs
       position: "End"
       tags: always
-    - rngd
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/rngd/tasks/fedora.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/rngd/tasks/fedora.yml
deleted file mode 100644
index 9fae7b73ac..0000000000
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/rngd/tasks/fedora.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: Install the rng-tools package (Fedora)
-  package:
-    name: rng-tools
-    state: latest
-
-- name: Update the rngd.service file (Fedora)
-  ini_file:
-    path: /usr/lib/systemd/system/rngd.service
-    section: service
-    option: ExecStart
-    value: "/sbin/rngd -f -r /dev/urandom -o /dev/random"
-    backup: yes
-
-- name: Start and enable "rngd" service (Fedora)
-  service:
-    name: rngd
-    state: started
-    enabled: yes
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/rngd/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/rngd/tasks/main.yml
deleted file mode 100644
index 5e09a54621..0000000000
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/rngd/tasks/main.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-################
-#  rng daemon  #
-################
-- name: Install rng-tools and start service
-  tags: rngd
-  block:
-    - name: Install rng-tools and start rng-tools.service (Ubuntu)
-      include_tasks: ubuntu.yml
-      when:
-        - ansible_distribution == "Ubuntu" and ansible_distribution_major_version < "21"
-
-    - name: Install rng-tools and start rngd (Fedora)
-      include_tasks: fedora.yml
-      when:
-        - (ansible_distribution == "RedHat" and ansible_distribution_major_version <= "8") or
-          (ansible_distribution == "CentOS" and ansible_distribution_major_version <= "8")
-
-    - name: Install rng-tools and start rng-tools.service (SLES)
-      include_tasks: sles.yml
-      when:
-        - ansible_distribution == "SLES" and ansible_distribution_major_version <= "12"
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/rngd/tasks/sles.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/rngd/tasks/sles.yml
deleted file mode 100644
index e82211ac92..0000000000
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/rngd/tasks/sles.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: Install the rng-tools package (SLES)
-  package:
-    name: rng-tools
-    state: latest
-
-- name: Update the rng-tools.service file (SLES)
-  ini_file:
-    path: /usr/lib/systemd/system/rng-tools.service
-    section: service
-    option: ExecStart
-    value: "usr/sbin/rngd -f -r /dev/urandom -o /dev/random"
-    backup: yes
-
-- name: Start and enable "rng-tools" service (SLES)
-  service:
-    name: rng-tools
-    state: started
-    enabled: yes
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/rngd/tasks/ubuntu.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/rngd/tasks/ubuntu.yml
deleted file mode 100644
index 581b048591..0000000000
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/rngd/tasks/ubuntu.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: Install the rng-tools package (Ubuntu)
-  package:
-    name: rng-tools
-    state: latest
-
-- name: Update the rng-tools defaults file (Ubuntu)
-  lineinfile:
-    dest: '/etc/default/rng-tools'
-    regexp: '^HRNGDEVICE=/dev/urandom'
-    mode: '0644'
-    insertafter: '^#HRNGDEVICE=/dev/null'
-    line: 'HRNGDEVICE=/dev/urandom'
-
-- name: Start and enable "rngd" service (Ubuntu)
-  systemd:
-    name: rng-tools.service
-    state: started
-    enabled: yes