From f3ceded008d7b30592355e67a56233f8f93c64f5 Mon Sep 17 00:00:00 2001 From: Tim Flink Date: Wed, 2 Jul 2014 13:49:07 +0000 Subject: [PATCH] fixing password variable names for taskotron-dev buildmaster config --- .../buildmaster-configure/templates/taskotron.master.cfg.j2 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 index 9a443a777d..27bc277ce2 100644 --- a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 +++ b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 @@ -16,7 +16,9 @@ c = BuildmasterConfig = {} from buildbot.buildslave import BuildSlave c['slaves'] = [ {% for buildslave in buildslaves %} - BuildSlave("{{ buildslave }}", "{{ buildslave_pw }}"), + {% if deployment_type == 'dev' %} + BuildSlave("{{ buildslave }}", "{{ dev_buildslave_password }}"), + {% endif %} {% endfor %} ] @@ -185,7 +187,7 @@ authz_cfg=authz.Authz( # change any of these to True to enable; see the manual for more # options {% if deployment_type == 'dev' %} - auth=auth.BasicAuth([("{{ dev_buildbot_user }}","{{ dev_buildbot_pw }}")]), + auth=auth.BasicAuth([("{{ dev_buildbot_user }}","{{ dev_buildbot_password }}")]), {% endif %} #auth=auth.BasicAuth([("{{ buildbot_user }}","{{ buildbot_pw }}")]), gracefulShutdown = False,