diff --git a/roles/head-node/files/compute-node.yml b/roles/head-node/files/compute-node.yml
index b8eb496..13d71e7 100644
--- a/roles/head-node/files/compute-node.yml
+++ b/roles/head-node/files/compute-node.yml
@@ -4,7 +4,7 @@
   remote_user: ubuntu
   tasks:
   - name: Include variables
-    include_vars: vars/compute-node.yml
+    include_vars: vars/compute-node-vars.yml
 
 - name: Configure compute hosts to use DNS server
   hosts: all
diff --git a/roles/head-node/files/do-ansible b/roles/head-node/files/do-ansible
index ae2efb9..0d91c31 100755
--- a/roles/head-node/files/do-ansible
+++ b/roles/head-node/files/do-ansible
@@ -22,4 +22,4 @@
 fi
 
 echo "ANSIBLE_ROLES_PATH=/etc/maas/ansible/roles ansible-playbook --private-key=/etc/maas/ansible/id_rsa -i $IP, /etc/maas/ansible/compute-node.yml $SKIP_TAGS $EXTRA_VARS" >> $LOG
-ANSIBLE_ROLES_PATH=/etc/maas/ansible/roles ansible-playbook --private-key=/etc/maas/ansible/id_rsa -i $IP, /etc/maas/ansible/compute-node.yml $SKIP_TAGS $EXTRA_VARS >> $LOG
+ANSIBLE_ROLES_PATH=/etc/maas/ansible/roles ansible-playbook --private-key=/etc/maas/ansible/id_rsa -i $IP, /etc/maas/ansible/compute-node.yml $SKIP_TAGS $EXTRA_VARS >> $LOG || exit $?
diff --git a/roles/head-node/tasks/main.yml b/roles/head-node/tasks/main.yml
index 166a328..c3aeb51 100644
--- a/roles/head-node/tasks/main.yml
+++ b/roles/head-node/tasks/main.yml
@@ -10,12 +10,15 @@
 - name: Ensure Ansible Roles
   become: yes
   copy:
-    src: roles
+    src: "{{ item }}"
     dest: /etc/maas/ansible
     owner: maas
     group: maas
     mode: u=rwX,g=rX,o=rX
     force: true
+  with_items:
+    - roles
+    - library
 
 - name: Ensure Role Permissions and Modes
   become: yes
@@ -79,7 +82,7 @@
   become: yes
   template:
     src=files/compute-node-vars.yml
-    dest=/etc/maas/ansible/vars/compute-node.yml
+    dest=/etc/maas/ansible/vars/compute-node-vars.yml
     owner=maas
     group=maas
     mode=0644