Fixed merge conflicts

deprecated_playbooks/playbook.yml

@@ -4,14 +4,10 @@
   #become_method: su
   #become_user: umcg-envsync
   pre_tasks:
-#    - name: Verify Ansible version meets requirements.
-#      assert:
-#        that: "ansible_version.full | version_compare('2.4', '>=')"
-#        msg: 'You must update Ansible to at least 2.4.x to use this playbook.'
-
-     - name: Fail when Ansible version is below 2.4
-       shell: echo "Please update your Ansible version to 2.4.x or higher."
-       failed_when: ansible_version.full < "2.4"
+    - name: Verify Ansible version meets requirements.
+      assert:
+        that: "ansible_version.full is version_compare('2.7', '>=')"
+        msg: 'You must update Ansible to at least 2.7.x to use this playbook.'
   roles:
   - role: easybuild-install
   tasks:

deprecated_playbooks/playbook_chaperone.yml

@@ -4,8 +4,8 @@
   pre_tasks:
     - name: Verify Ansible version meets requirements.
       assert:
-        that: "ansible_version.full | version_compare('2.4', '>=')"
-        msg: 'You must update Ansible to at least 2.4.x to use this playbook.'
+        that: "ansible_version.full is version_compare('2.7', '>=')"
+        msg: 'You must update Ansible to at least 2.7.x to use this playbook.'
   roles:
   - role: easybuild-install
   tasks:

inventory.py

@@ -8,8 +8,8 @@
 Generates Ansible inventory with hostnames from a static inventory file.
 By default this script looks for an inventory named
     inventory.ini
-located in the same dir as this script.
-or alternatively for an inventory file name as defined in
+located in the same dir as this script or
+alternatively for an inventory file name as defined in
     export AI_INVENTORY='some_inventory.ini'
 
 The hostnames parsed from the static inventory file can be prefixed

roles/install-easybuild/tasks/main.yml

@@ -155,3 +155,4 @@
 - name: Flush handlers to trigger EasyBuild installation.
   meta: flush_handlers
 ...
+