Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

fixing password variable names for taskotron-dev buildmaster config

Browse source
This commit is contained in:
Tim Flink 2014-07-02 13:49:07 +00:00
parent 2d7fb37eda
commit f3ceded008
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
View file

@ -16,7 +16,9 @@ c = BuildmasterConfig = {}
from buildbot.buildslave import BuildSlave from buildbot.buildslave import BuildSlave
c['slaves'] = [ c['slaves'] = [
{% for buildslave in buildslaves %} {% for buildslave in buildslaves %}
BuildSlave("{{ buildslave }}", "{{ buildslave_pw }}"), {% if deployment_type == 'dev' %}
BuildSlave("{{ buildslave }}", "{{ dev_buildslave_password }}"),
{% endif %}
{% endfor %} {% endfor %}
] ]
@ -185,7 +187,7 @@ authz_cfg=authz.Authz(
# change any of these to True to enable; see the manual for more # change any of these to True to enable; see the manual for more
# options # options
{% if deployment_type == 'dev' %} {% if deployment_type == 'dev' %}
auth=auth.BasicAuth([("{{ dev_buildbot_user }}","{{ dev_buildbot_pw }}")]), auth=auth.BasicAuth([("{{ dev_buildbot_user }}","{{ dev_buildbot_password }}")]),
{% endif %} {% endif %}
#auth=auth.BasicAuth([("{{ buildbot_user }}","{{ buildbot_pw }}")]), #auth=auth.BasicAuth([("{{ buildbot_user }}","{{ buildbot_pw }}")]),
gracefulShutdown = False, gracefulShutdown = False,