Split main role file in the Fidimag role into smaller role files for modularity.

Author: mvousden

roles/fidimag/tasks/clone_fidimag_version.yml

@@ -0,0 +1,20 @@
+---
+# This Ansible include-playbook clones Fidimag source.
+
+- name: Ensure that Git and openssh-client are installed.
+  apt:
+    pkg: "{{ item }}"
+    state: latest
+    update_cache: yes
+    cache_valid_time: 86400
+  with_items:
+    - git
+    - openssh-client
+  sudo: yes
+
+- name: Clone the Fidimag source.
+  git:
+    repo: "{{ FIDIMAG_REPO_URL }}"
+    dest: "{{ FIDIMAG_INSTALL_PATH }}"
+    version: "{{ FIDIMAG_VERSION }}"
+  sudo: yes

roles/fidimag/tasks/install_dependencies_from_packages.yml

@@ -0,0 +1,27 @@
+---
+# This Ansible include-playbook installs Fidimag dependencies from packages.
+
+- name: Install dependencies in Ubuntu packages.
+  apt:
+    pkg: "{{ item }}"
+    state: latest
+    update_cache: yes
+    cache_valid_time: 86400
+  with_items:
+    - gcc
+    - ipython
+    - mayavi2
+    - python-dev
+    - python-matplotlib
+    - python-numpy
+    - python-pip
+    - python-pytest
+    - python-pyvtk
+    - python-scipy
+  sudo: yes
+
+- name: Install dependencies with Pip.
+  pip:
+    name: cython
+    extra_args: --upgrade
+  sudo: yes

roles/fidimag/tasks/main.yml

@@ -1,77 +1,7 @@
 ---
 # This Ansible role installs Fidimag on the virtual machine.
 
-# Clone fidimag from the repository.
-- name: Ensure that Git and openssh-client are installed.
-  apt:
-    pkg: "{{ item }}"
-    state: latest
-    update_cache: yes
-    cache_valid_time: 86400
-  with_items:
-    - git
-    - openssh-client
-  sudo: yes
-
-- name: Clone the Fidimag source.
-  git:
-    repo: "{{ FIDIMAG_REPO_URL }}"
-    dest: "{{ FIDIMAG_INSTALL_PATH }}"
-    version: "{{ FIDIMAG_VERSION }}"
-  sudo: yes
-
-# Install dependencies.
-- name: Install dependencies in Ubuntu packages.
-  apt:
-    pkg: "{{ item }}"
-    state: latest
-    update_cache: yes
-    cache_valid_time: 86400
-  with_items:
-    - gcc
-    - ipython
-    - mayavi2
-    - python-dev
-    - python-matplotlib
-    - python-numpy
-    - python-pytest
-    - python-pyvtk
-    - python-scipy
-  sudo: yes
-
-- name: Install dependencies with Pip.
-  pip:
-    name: cython
-    extra_args: --upgrade
-  sudo: yes
-
-# Install local dependencies.
-- name: Install FFTW and SUNDIALS from the Fidimag installation script.
-  command: bash install.sh
-  args:
-    chdir: "{{ FIDIMAG_INSTALL_PATH }}/bin"
-  sudo: yes
-
-# Build fidimag. Makefile module?
-- name: Build Fidimag.
-  command: make
-  args:
-    chdir: "{{ FIDIMAG_INSTALL_PATH }}"
-  sudo: yes
-
-# Organise paths.
-- name: Add fidimag to PYTHONPATH.
-  lineinfile:
-    dest: /etc/profile.d/fidimag.sh
-    regexp: "^export PYTHONPATH="
-    line: "export PYTHONPATH=\"{{ FIDIMAG_INSTALL_PATH }}/:$PYTHONPATH\""
-    create: yes
-  sudo: yes
-
-- name: Add fidimag library path to LD_LIBRARY_PATH.
-  lineinfile:
-    dest: /etc/profile.d/fidimag.sh
-    regexp: "^export LD_LIBRARY_PATH="
-    line: "export LD_LIBRARY_PATH=\"{{ FIDIMAG_INSTALL_PATH }}/local/lib:$LD_LIBRARY_PATH\""
-    create: yes
-  sudo: yes
+- include: clone_fidimag_version.yml
+- include: install_dependencies_from_packages.yml
+- include: make_fidimag.yml
+- include: set_paths.yml

roles/fidimag/tasks/make_fidimag.yml

@@ -0,0 +1,18 @@
+---
+# This Ansible playbook build Fidimag from scripts in the Fidimag
+# repository. This include installing local dependencies including FFTW and
+# SUNDIALS.
+
+# Install local dependencies.
+- name: Install FFTW and SUNDIALS from the Fidimag installation script.
+  command: bash install.sh
+  args:
+    chdir: "{{ FIDIMAG_INSTALL_PATH }}/bin"
+  sudo: yes
+
+# Build Fidimag. Makefile module?
+- name: Build Fidimag.
+  command: make
+  args:
+    chdir: "{{ FIDIMAG_INSTALL_PATH }}"
+  sudo: yes

roles/fidimag/tasks/set_paths.yml

@@ -0,0 +1,19 @@
+---
+# This Ansible include-playbook sets envionment variables which denote
+# essential paths for Fidimag.
+
+- name: Add Fidimag to PYTHONPATH.
+  lineinfile:
+    dest: /etc/profile.d/fidimag.sh
+    regexp: "^export PYTHONPATH="
+    line: "export PYTHONPATH=\"{{ FIDIMAG_INSTALL_PATH }}/:$PYTHONPATH\""
+    create: yes
+  sudo: yes
+
+- name: Add Fidimag library path to LD_LIBRARY_PATH.
+  lineinfile:
+    dest: /etc/profile.d/fidimag.sh
+    regexp: "^export LD_LIBRARY_PATH="
+    line: "export LD_LIBRARY_PATH=\"{{ FIDIMAG_INSTALL_PATH }}/local/lib:$LD_LIBRARY_PATH\""
+    create: yes
+  sudo: yes