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

updating buildslave configuration for infra playbook and adding required variables

Browse source
This commit is contained in:
Tim Flink 2014-07-03 13:44:56 +00:00
parent a011b1d485
commit a3aa563c0f
9 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
inventory/group_vars/taskotron-dev-clients
View file

@ -15,3 +15,4 @@ buildslave_port: 9989
tcp_ports: [ "{{ buildslave_port }}" ]
buildslave_private_sshkey_file: dev-buildslave-sshkey/dev_buildslave
buildslave_public_sshkey_file: dev-buildslave-sshkey/dev_buildslave.pub
taskotron_admin_email: taskotron-admin-members@fedoraproject.org

1
inventory/host_vars/virt26.qa.fedoraproject.org
View file

@ -10,4 +10,5 @@ vmhost: qa07.qa.fedoraproject.org
datacenter: phx2
short_hostname: virt26.qa
buildslave_name: virt26
fas_client_groups: sysadmin-qa,sysadmin-main

1
inventory/host_vars/virt27.qa.fedoraproject.org
View file

@ -10,4 +10,5 @@ vmhost: qa07.qa.fedoraproject.org
datacenter: phx2
short_hostname: virt27.qa
buildslave_name: virt27
fas_client_groups: sysadmin-qa,sysadmin-main

1
inventory/host_vars/virt28.qa.fedoraproject.org
View file

@ -10,4 +10,5 @@ vmhost: qa07.qa.fedoraproject.org
datacenter: phx2
short_hostname: virt28.qa
buildslave_name: virt28
fas_client_groups: sysadmin-qa,sysadmin-main

1
inventory/host_vars/virt29.qa.fedoraproject.org
View file

@ -10,4 +10,5 @@ vmhost: qa07.qa.fedoraproject.org
datacenter: phx2
short_hostname: virt29.qa
buildslave_name: virt29
fas_client_groups: sysadmin-qa,sysadmin-main

2
roles/taskotron/buildslave-configure/defaults/main.yml Normal file
View file

@ -0,0 +1,2 @@
---
taskotron_admin_email: root@localhost.localdomain

4
roles/taskotron/buildslave-configure/tasks/main.yml
View file

@ -2,10 +2,10 @@
command: creates={{ slave_dir }} buildslave create-slave {{ slave_dir }} {{ buildmaster }} buildslave passwd
- name: generate slave config
template: src={{ templates }}/buildslave/buildbot.tac.j2 dest={{ slave_dir }}/buildbot.tac mode=0600 owner={{ slave_user }} group={{ slave_user }}
template: src=buildbot.tac.j2 dest={{ slave_dir }}/buildbot.tac mode=0600 owner={{ slave_user }} group={{ slave_user }}
- name: generate slave info
template: src={{ templates }}/buildslave/{{ item }}.j2 dest={{ slave_dir }}/info/{{ item }} mode=0644 owner={{ slave_user }} group={{ slave_user }}
template: src={{ item }}.j2 dest={{ slave_dir }}/info/{{ item }} mode=0644 owner={{ slave_user }} group={{ slave_user }}
with_items:
- admin
- host

2
roles/taskotron/buildslave-configure/templates/admin.j2
View file

@ -1 +1 @@
Taskbot Admin <admin@tirfa.net>
Taskotron Admin <{{ taskotron_admin_email }}>

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

@ -30,7 +30,9 @@ except ImportError:
buildmaster_host = '{{ buildmaster }}'
port = 9989
slavename = '{{ buildslave_name }}'
passwd = '{{ buildslave_pw }}'
{% if deployment_type == 'dev' %}
passwd = '{{ dev_buildslave_password }}'
{% endif %}
keepalive = 600
usepty = 0
umask = None