diff options
author | Daniel Narvaez <dwnarvaez@gmail.com> | 2013-01-25 21:00:58 (GMT) |
---|---|---|
committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2013-01-25 21:00:58 (GMT) |
commit | da25a22e1a25a0baff8aa9ea72a54078e6a95f10 (patch) | |
tree | 99850f7ae5403240796f26e8cfa4018f0d1dff61 /fabfile | |
parent | 358ece4cf44524d4bf35f16d8241f2dc9c6b29e2 (diff) |
Fix locks
Diffstat (limited to 'fabfile')
-rw-r--r-- | fabfile/master.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fabfile/master.py b/fabfile/master.py index 37bfcad..311a2d3 100644 --- a/fabfile/master.py +++ b/fabfile/master.py @@ -90,14 +90,18 @@ def configure(instance_name=get_instance_name()): tac = StringIO.StringIO() for host, info in slaves.items(): - name = info["name"] + slave_config = {"lock": info["lock"]} + config["slaves"][info["name"]] = slave_config + with settings(host_string=host, gateway=info["gateway"]): get(os.path.join(instance_info["slave_dir"], "buildbot.tac"), tac) for line in tac.getvalue().split("\n"): start = "passwd = " if line.startswith(start): password = line[len(start) + 1:-1] - config["slaves"][name] = {"password": password} + slave_config["password"] = password + + if instance_info["upload_docs"]: config["slaves"][docs_slave]["upload_docs"] = True |