teuthology: use variable for user name

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@gmail.com>

diff --git a/roles/teuthology/tasks/main.yml b/roles/teuthology/tasks/main.yml
index d5cdb28ae13164cfd92d7b7f7f5168c9036b66a2..3a276f3d7c6b116bb6ee77ae7741a3f3d1b5ffe9 100644 (file)
--- a/roles/teuthology/tasks/main.yml
+++ b/roles/teuthology/tasks/main.yml
@@ -31,10 +31,10 @@
 - name: Ship teuthology user's crontab update script
   template:
     src: update-crontab.sh
-    dest: /home/teuthology/bin/update-crontab.sh
+    dest: "/home/{{ teuthology_scheduler_user }}/bin/update-crontab.sh"
     mode: 0775
-    owner: teuthology
-    group: teuthology
+    owner: "{{ teuthology_scheduler_user }}"
+    group: "{{ teuthology_scheduler_user }}"
   tags:
     - crontab
 

diff --git a/roles/teuthology/templates/teuthology-worker.init b/roles/teuthology/templates/teuthology-worker.init
index 590b4616c343b00c590a8eecb6277d6afc45849c..63d9ec9045c11bb61ad211cdc1d0e5ec9761110e 100644 (file)
--- a/roles/teuthology/templates/teuthology-worker.init
+++ b/roles/teuthology/templates/teuthology-worker.init
@@ -35,7 +35,7 @@ export NWORKERS=20
 
 [ -f /etc/default/teuthology ] && source /etc/default/teuthology
 
-user=${TEUTHOLOGY_USERNAME:-teuthworker}
+user=${TEUTHOLOGY_USERNAME:-"{{ teuthology_execution_user }}"}
 export HOME=/home/$user
 export WORKER_HOME=$HOME/src/teuthology_master
 #/usr/share/nginx/html