fixing buildslave setup for taskotron client hosts
This commit is contained in:
parent
fe0f646b55
commit
d10f99b2a8
4 changed files with 6 additions and 14 deletions
inventory/group_vars
roles/taskotron/buildslave-configure/templates
|
@ -24,6 +24,7 @@ extra_enablerepos: 'infrastructure-testing'
|
||||||
slaves_group: buildslaves
|
slaves_group: buildslaves
|
||||||
buildmaster: 10.5.124.181
|
buildmaster: 10.5.124.181
|
||||||
buildslave_port: 9989
|
buildslave_port: 9989
|
||||||
|
buildslave_password: "{{ dev_buildslave_password }}"
|
||||||
taskotron_admin_email: taskotron-admin-members@fedoraproject.org
|
taskotron_admin_email: taskotron-admin-members@fedoraproject.org
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -22,6 +22,7 @@ extra_enablerepos: ''
|
||||||
slaves_group: buildslaves
|
slaves_group: buildslaves
|
||||||
buildmaster: 10.5.124.206
|
buildmaster: 10.5.124.206
|
||||||
buildslave_port: 9989
|
buildslave_port: 9989
|
||||||
|
buildslave_password: "{{ prod_buildslave_password }}"
|
||||||
taskotron_admin_email: taskotron-admin-members@fedoraproject.org
|
taskotron_admin_email: taskotron-admin-members@fedoraproject.org
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -24,6 +24,7 @@ extra_enablerepos: 'infrastructure-testing'
|
||||||
slaves_group: buildslaves
|
slaves_group: buildslaves
|
||||||
buildmaster: 10.5.124.232
|
buildmaster: 10.5.124.232
|
||||||
buildslave_port: 9989
|
buildslave_port: 9989
|
||||||
|
buildslave_password: "{{ stg_buildslave_password }}"
|
||||||
taskotron_admin_email: taskotron-admin-members@fedoraproject.org
|
taskotron_admin_email: taskotron-admin-members@fedoraproject.org
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -34,24 +34,13 @@ except ImportError:
|
||||||
|
|
||||||
buildmaster_host = '{{ buildmaster }}'
|
buildmaster_host = '{{ buildmaster }}'
|
||||||
port = 9989
|
port = 9989
|
||||||
{% if deployment_type in ['prod', 'stg', 'local', 'qa-stg'] %}
|
{% if deployment_type in ['local', 'qa-stg'] %}
|
||||||
slavename = '{{ buildslave_name }}'
|
slavename = '{{ buildslave_name }}'
|
||||||
|
passwd = '{{ buildslave_password }}'
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if deployment_type == 'dev' %}
|
{% if deployment_type in ['dev', 'stg', 'prod'] %}
|
||||||
slavename = '{{ item.user }}'
|
slavename = '{{ item.user }}'
|
||||||
{% endif %}
|
{% 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' %}
|
{% if deployment_type == 'qadevel-prod' %}
|
||||||
passwd = '{{ qadevel_prod_buildslave_password }}'
|
passwd = '{{ qadevel_prod_buildslave_password }}'
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue