roles/ubuntu_base/tasks/facts.yml

@@ -1,3 +0,0 @@
----
-- name: Gather facts
-  gather_facts:

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"

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

roles/ubuntu_base/tasks/virtualization.yml

@@ -0,0 +1,4 @@
+---
+- name: Find out if running in a VM
+  setup:
+    gather_subset: virtualization_role