Split out install from PPA behaviour

playbooks/includes/install-fish

@@ -1,16 +1,8 @@
 ---
 # Adds the fish-shell release PPA and installs fish.
 
-- name: install python-pycurl (needed to add fish PPA)
-  apt: pkg=python-pycurl
-
-- name: add fish PPA (Debian)
-  apt_repository: repo='ppa:fish-shell/release-2' update_cache=yes
-  when: ansible_os_family == 'Debian'
-
-- name: add fish PPA (Mint)
-  apt_repository: repo='deb http://ppa.launchpad.net/fish-shell/release-2/ubuntu raring main' update_cache=yes
-  when: ansible_os_family == 'Linuxmint'
-
-- name: install fish
-  apt: pkg=fish
+- include: install-from-ppa
+  vars:
+    ppa: 'ppa:fish-shell/release-2'
+    ppa_mint: 'deb http://ppa.launchpad.net/fish-shell/release-2/ubuntu raring main'
+    package: 'fish'

playbooks/includes/install-from-ppa

@@ -0,0 +1,16 @@
+---
+# Adds a PPA and installs a package
+
+- name: install python-pycurl (needed to add {{ package }} PPA)
+  apt: pkg=python-pycurl
+
+- name: add PPA for {{ package }} (Debian)
+  apt_repository: repo="{{ ppa }}" update_cache=yes
+  when: ansible_os_family == 'Debian'
+
+- name: add PPA for {{ package }} (Mint)
+  apt_repository: repo="{{ ppa_mint }}" update_cache=yes
+  when: ansible_os_family == 'Linuxmint'
+
+- name: install {{ package }}
+  apt: pkg={{ package }} force=yes