CORD-396 CORD-383 CORD-362 CORD-309 significant rework on networking configuration

Change-Id: Icb3cbac66b33265486ac236572874052fc643b8a
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