use the jenkins_user variable in the slave.yml.j2 template

Signed-off-by: Alfredo Deza <adeza@redhat.com>

diff --git a/ansible/slave.yml.j2 b/ansible/slave.yml.j2
index db80405a69758f62b9559bb2b1465e5bd0afc608..49682c4cb6d96f55861eeccc0d2bdacb044f724a 100644 (file)
--- a/ansible/slave.yml.j2
+++ b/ansible/slave.yml.j2
@@ -12,22 +12,22 @@
    - nodename: '${nodename}'
    - labels: '${labels}'
   tasks:
-    - name: create a jenkins-build user
-      user: name=jenkins-build comment="Jenkins Build Slave User"
+    - name: create a {{ jenkins_user }} user
+      user: name={{ jenkins_user }} comment="Jenkins Build Slave User"
 
     - name: Create .ssh directory
-      file: path=/home/jenkins-build/.ssh
+      file: path=/home/{{ jenkins_user }}/.ssh
             state=directory
 
     - name: set the authorized keys
-      authorized_key: user=jenkins-build key="{{ lookup('file', 'playbook/files/ssh/keys/jenkins_build.pub') }}"
+      authorized_key: user={{ jenkins_user }} key="{{ lookup('file', 'playbook/files/ssh/keys/jenkins_build.pub') }}"
 
-    - name: ensure jenkins-build can sudo without a prompt
+    - name: ensure {{ jenkins_user }} can sudo without a prompt
       sudo: yes
       lineinfile:
         dest: /etc/sudoers
-        regexp: '^jenkins-build ALL'
-        line: 'jenkins-build   ALL=(ALL:ALL) NOPASSWD:ALL'
+        regexp: '^{{ jenkins_user }} ALL'
+        line: '{{ jenkins_user }}   ALL=(ALL:ALL) NOPASSWD:ALL'
         validate: 'visudo -cf %s'
 
     - name: ensure the build dir exists
@@ -136,4 +136,4 @@
         labels: "{{ labels }}"
         host: "{{ ansible_default_ipv4.address }}"
         credentialsId: '39fa150b-b2a1-416e-b334-29a9a2c0b32d'
-        remoteFS: '/home/jenkins-build/build'
+        remoteFS: '/home/{{ jenkins_user }}/build'