]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
use jinja2 vars instead of mako in slave.yml.j2
authorAndrew Schoen <aschoen@redhat.com>
Tue, 26 Apr 2016 14:48:38 +0000 (09:48 -0500)
committerAndrew Schoen <aschoen@redhat.com>
Tue, 26 Apr 2016 14:48:38 +0000 (09:48 -0500)
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>
ansible/slave.yml.j2

index d0768390d3d0ac4ecf20f1af77ecc01ceae78626..4aa5efe4b3e2c104fc19e69e50917401bd6aa982 100644 (file)
@@ -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