diff --git a/roles/compute-prep/tasks/main.yml b/roles/compute-prep/tasks/main.yml
index a62305f..0c57979 100644
--- a/roles/compute-prep/tasks/main.yml
+++ b/roles/compute-prep/tasks/main.yml
@@ -10,11 +10,21 @@
   with_items:
     - python-yaml
 
+- name: Add ubuntu user
+  user:
+   name=ubuntu
+   groups=admin
+
 - name: Add head node ubuntu user key
   authorized_key:
     user=ubuntu
     key="{{ hostvars[groups['head'][0]]['sshkey']['stdout'] }}"
 
+- name: Add head node root user key
+  authorized_key:
+    user=root
+    key="{{ hostvars[groups['head'][0]]['sshkey']['stdout'] }}"
+
 - name: Add route via /etc/rc.local
   template:
     src=rc.local.j2
@@ -22,9 +32,9 @@
     mode=0755
   notify:
     - run rc.local
+  when: not cord_provisioned
 
 - name: Create /var/lib/nova dir
   file:
     path=/var/lib/nova
     state=directory
-