Add pre tasks to converge playbook

UCL-MIRSG · Dec 18, 2023 · 60540ca · 60540ca
1 parent b1c8d52
commit 60540ca
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/tests/molecule/resources/converge.yml b/tests/molecule/resources/converge.yml
@@ -3,6 +3,19 @@
   hosts: all
   become: true
   gather_facts: true
+  pre_tasks:
+    - name: Check the major Python version for the OS
+      tags: python
+      block:
+        - name: Check default version
+          ansible.builtin.include_role:
+            name: mirsg.infrastructure.install_python
+            tasks_from: check_default_version
+
+        - name: Set install_python variable based on the version to be installed
+          ansible.builtin.set_fact:
+            install_python: "{{ install_python2 if default_python_version is version('2') else install_python3 }}"
+
   roles:
     - role: mirsg.infrastructure.provision
       tags: provision

diff --git a/tests/molecule/resources/prepare.yml b/tests/molecule/resources/prepare.yml
@@ -17,18 +17,6 @@
             regexp: "^FirewallBackend="
             line: FirewallBackend=iptables
 
-    - name: Check the major Python version for the OS
-      tags: python
-      block:
-        - name: Check default version
-          ansible.builtin.include_role:
-            name: mirsg.infrastructure.install_python
-            tasks_from: check_default_version
-
-        - name: Set install_python variable based on the version to be installed
-          ansible.builtin.set_fact:
-            install_python: "{{ install_python2 if default_python_version is version('2') else install_python3 }}"
-
     - name: Setup for PostgreSQL
       tags: postgresql
       block: