Merge pull request #15 from CSCfi/ansible24

ansible 2.4 preparation
fgci-org · Nov 1, 2017 · f82a4fe · f82a4fe
2 parents 59965fb + 44ab5b2
commit f82a4fe
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/meta/main.yml b/meta/main.yml
@@ -14,7 +14,7 @@ galaxy_info:
   # - Apache
   # - CC-BY
   license: MIT
-  min_ansible_version: 2.2
+  min_ansible_version: 2.4
   #
   # Below are all platforms currently available. Just uncomment
   # the ones that apply to your role. If you don't see your 

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -9,10 +9,10 @@
     - "{{ ansible_os_family|lower }}.yml"
 
 - block:
-  - include: configure_yum.yml
+  - include_tasks: configure_yum.yml
     when: ansible_pkg_mgr == 'yum'
 
-  - include: configure_apt.yml
+  - include_tasks: configure_apt.yml
     when: ansible_pkg_mgr == 'apt'
 
   - name: Install CUDA and related packages (1.5-2GB download, also restarts if cuda_restart_node_on_install is set to True)
@@ -32,7 +32,7 @@
       mode: 0755
     when: cuda_bash_profile
 
-  - include: cuda_init.yml
+  - include_tasks: cuda_init.yml
     when: cuda_init == True
 
   # This is here because if we in the same playbook try to start slurmd without

diff --git a/vars/ubuntu-17.04.yml b/vars/ubuntu-17.04.yml
@@ -0,0 +1,4 @@
+---
+cuda_repo_subfolder: ubuntu1704
+
+# vim:ft=ansible: