infrastructure/ansible
2
0
Fork 0
Code Pull requests 7 Activity Actions

fixing buildslave setup for taskotron client hosts

Browse source
This commit is contained in:
Tim Flink 2016-01-26 19:43:31 +00:00
parent fe0f646b55
commit d10f99b2a8
4 changed files with 6 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
inventory/group_vars/taskotron-dev-client-hosts
View file

@ -24,6 +24,7 @@ extra_enablerepos: 'infrastructure-testing'
slaves_group: buildslaves
buildmaster: 10.5.124.181
buildslave_port: 9989
buildslave_password: "{{ dev_buildslave_password }}"
taskotron_admin_email: taskotron-admin-members@fedoraproject.org

1
inventory/group_vars/taskotron-prod-client-hosts
View file

@ -22,6 +22,7 @@ extra_enablerepos: ''
slaves_group: buildslaves
buildmaster: 10.5.124.206
buildslave_port: 9989
buildslave_password: "{{ prod_buildslave_password }}"
taskotron_admin_email: taskotron-admin-members@fedoraproject.org

1
inventory/group_vars/taskotron-stg-client-hosts
View file

@ -24,6 +24,7 @@ extra_enablerepos: 'infrastructure-testing'
slaves_group: buildslaves
buildmaster: 10.5.124.232
buildslave_port: 9989
buildslave_password: "{{ stg_buildslave_password }}"
taskotron_admin_email: taskotron-admin-members@fedoraproject.org

17
roles/taskotron/buildslave-configure/templates/buildbot.tac.j2
View file

@ -34,24 +34,13 @@ except ImportError:
buildmaster_host = '{{ buildmaster }}'
port = 9989
{% if deployment_type in ['prod', 'stg', 'local', 'qa-stg'] %}
{% if deployment_type in ['local', 'qa-stg'] %}
slavename = '{{ buildslave_name }}'
passwd = '{{ buildslave_password }}'
{% endif %}
{% if deployment_type == 'dev' %}
{% if deployment_type in ['dev', 'stg', 'prod'] %}
slavename = '{{ item.user }}'
{% endif %}
{% if deployment_type == 'dev' %}
passwd = '{{ dev_buildslave_password }}'
{% endif %}
{% if deployment_type == 'stg' %}
passwd = '{{ stg_buildslave_password }}'
{% endif %}
{% if deployment_type == 'prod' %}
passwd = '{{ prod_buildslave_password }}'
{% endif %}
{% if deployment_type == 'local' %}
passwd = '{{ local_buildslave_password }}'
{% endif %}
{% if deployment_type == 'qadevel-prod' %}
passwd = '{{ qadevel_prod_buildslave_password }}'