From 02652678a857030fba244eddffb67ad429c4c5bb Mon Sep 17 00:00:00 2001 From: Tim Flink Date: Tue, 9 Feb 2016 22:58:57 +0000 Subject: [PATCH] fixing some partially fixed and missindata --- inventory/group_vars/qa-stg | 1 + roles/taskotron/buildslave-configure/templates/buildbot.tac.j2 | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/inventory/group_vars/qa-stg b/inventory/group_vars/qa-stg index 53405c3836..786e45d6f0 100644 --- a/inventory/group_vars/qa-stg +++ b/inventory/group_vars/qa-stg @@ -68,6 +68,7 @@ slave_home: /home/buildslave/ slave_dir: /home/buildslave/slave slave_user: buildslave buildslave_name: 'qa-stg01-1' +buildslave_password: '{{ qa_stg_buildslave_password }}' deployment_type: qa-stg tcp_ports: [ 80, 222, 443, "{{ buildslave_port }}", 3306 ] diff --git a/roles/taskotron/buildslave-configure/templates/buildbot.tac.j2 b/roles/taskotron/buildslave-configure/templates/buildbot.tac.j2 index 68897bcf41..7340209e89 100644 --- a/roles/taskotron/buildslave-configure/templates/buildbot.tac.j2 +++ b/roles/taskotron/buildslave-configure/templates/buildbot.tac.j2 @@ -46,9 +46,6 @@ passwd = '{{ buildslave_password }}' {% if deployment_type == 'qadevel-prod' %} passwd = '{{ qadevel_prod_buildslave_password }}' {% endif %} -{% if deployment_type == 'qa-stg' %} -passwd = '{{ qa_stg_buildslave_password }}' -{% endif %} keepalive = 600 usepty = 0