From 3b7c096f8ecb5371f0f9d43e735e16903ab8b717 Mon Sep 17 00:00:00 2001
From: Sam Al-Sapti <sam@sapti.me>
Date: Mon, 14 Nov 2022 00:13:24 +0100
Subject: [PATCH] Simplify config and rename some files

---
 roles/ubuntu_base/tasks/facts.yml                 | 3 ---
 roles/ubuntu_base/tasks/main.yml                  | 6 +++---
 roles/ubuntu_base/tasks/{ssh.yml => ssh-port.yml} | 8 ++------
 roles/ubuntu_base/tasks/virtualization.yml        | 4 ++++
 4 files changed, 9 insertions(+), 12 deletions(-)
 delete mode 100644 roles/ubuntu_base/tasks/facts.yml
 rename roles/ubuntu_base/tasks/{ssh.yml => ssh-port.yml} (75%)
 create mode 100644 roles/ubuntu_base/tasks/virtualization.yml

diff --git a/roles/ubuntu_base/tasks/facts.yml b/roles/ubuntu_base/tasks/facts.yml
deleted file mode 100644
index abd9a28..0000000
--- a/roles/ubuntu_base/tasks/facts.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-- name: Gather facts
-  gather_facts:
diff --git a/roles/ubuntu_base/tasks/main.yml b/roles/ubuntu_base/tasks/main.yml
index ba1be61..d21a74f 100644
--- a/roles/ubuntu_base/tasks/main.yml
+++ b/roles/ubuntu_base/tasks/main.yml
@@ -1,8 +1,8 @@
 ---
-- import_tasks: ssh.yml
+- import_tasks: ssh-port.yml
   tags: [change-ssh-port]
-- import_tasks: facts.yml
-  tags: [gather-facts]
+- import_tasks: virtualization.yml
+  tags: [gather-virtualization-facts]
 - import_tasks: dell-apt-repo.yml
   tags: [setup-dell-apt-repo]
   when: ansible_virtualization_role != "guest"
diff --git a/roles/ubuntu_base/tasks/ssh.yml b/roles/ubuntu_base/tasks/ssh-port.yml
similarity index 75%
rename from roles/ubuntu_base/tasks/ssh.yml
rename to roles/ubuntu_base/tasks/ssh-port.yml
index b3b9890..a6a598a 100644
--- a/roles/ubuntu_base/tasks/ssh.yml
+++ b/roles/ubuntu_base/tasks/ssh-port.yml
@@ -16,9 +16,7 @@
   set_fact:
     ansible_port: 22
   when: ssh_configured is defined and
-        (ssh_configured.state is undefined or
-        (ssh_configured.state is defined and
-        ssh_configured.state != "started")) and
+        ssh_configured.state is undefined and
         ansible_port != 2222
 
 - name: Change SSH port on host
@@ -29,9 +27,7 @@
   register: ssh_changed
   notify: "Restart sshd"
   when: ssh_configured is defined and
-        (ssh_configured.state is undefined or
-        (ssh_configured.state is defined and
-        ssh_configured.state != "started"))
+        ssh_configured.state is undefined
 
 - name: Ensure sshd is reloaded if needed
   meta: flush_handlers
diff --git a/roles/ubuntu_base/tasks/virtualization.yml b/roles/ubuntu_base/tasks/virtualization.yml
new file mode 100644
index 0000000..b1929d4
--- /dev/null
+++ b/roles/ubuntu_base/tasks/virtualization.yml
@@ -0,0 +1,4 @@
+---
+- name: Find out if running in a VM
+  setup:
+    gather_subset: virtualization_role