From: Andrew Schoen <aschoen@redhat.com>
Date: Tue, 26 Apr 2016 14:48:38 +0000 (-0500)
Subject: use jinja2 vars instead of mako in slave.yml.j2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f4ab2de93c48b4c57b88108c2e329c7a77e151df;p=ceph-build.git

use jinja2 vars instead of mako in slave.yml.j2

We're going to pass --extra-vars in the prado command now so there is no
need to do extra templateting with mako.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
---

diff --git a/ansible/slave.yml.j2 b/ansible/slave.yml.j2
index d0768390..4aa5efe4 100644
--- a/ansible/slave.yml.j2
+++ b/ansible/slave.yml.j2
@@ -7,10 +7,10 @@
    - jenkins_user: 'jenkins-build'
    # jenkins API credentials:
    - api_user: 'ceph-jenkins'
-   - token: '${token}'
+   - token: '{{ token }}'
    - api_uri: 'https://jenkins.ceph.com'
-   - nodename: '${nodename}'
-   - labels: '${labels}'
+   - nodename: '{{ nodename }}'
+   - labels: '{{ labels }}'
 
   tasks:
     - name: create a {{ jenkins_user }} user