From a3aa563c0f1267110c4373868c3f2d600dea2c18 Mon Sep 17 00:00:00 2001 From: Tim Flink Date: Thu, 3 Jul 2014 13:44:56 +0000 Subject: [PATCH] updating buildslave configuration for infra playbook and adding required variables --- inventory/group_vars/taskotron-dev-clients | 1 + inventory/host_vars/virt26.qa.fedoraproject.org | 1 + inventory/host_vars/virt27.qa.fedoraproject.org | 1 + inventory/host_vars/virt28.qa.fedoraproject.org | 1 + inventory/host_vars/virt29.qa.fedoraproject.org | 1 + roles/taskotron/buildslave-configure/defaults/main.yml | 2 ++ roles/taskotron/buildslave-configure/tasks/main.yml | 4 ++-- roles/taskotron/buildslave-configure/templates/admin.j2 | 2 +- .../taskotron/buildslave-configure/templates/buildbot.tac.j2 | 4 +++- 9 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 roles/taskotron/buildslave-configure/defaults/main.yml diff --git a/inventory/group_vars/taskotron-dev-clients b/inventory/group_vars/taskotron-dev-clients index f87db606c7..bbd5836953 100644 --- a/inventory/group_vars/taskotron-dev-clients +++ b/inventory/group_vars/taskotron-dev-clients @@ -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 diff --git a/inventory/host_vars/virt26.qa.fedoraproject.org b/inventory/host_vars/virt26.qa.fedoraproject.org index bbb234ed6b..c7d52577c6 100644 --- a/inventory/host_vars/virt26.qa.fedoraproject.org +++ b/inventory/host_vars/virt26.qa.fedoraproject.org @@ -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 diff --git a/inventory/host_vars/virt27.qa.fedoraproject.org b/inventory/host_vars/virt27.qa.fedoraproject.org index 58e7cff71d..43dffc73f6 100644 --- a/inventory/host_vars/virt27.qa.fedoraproject.org +++ b/inventory/host_vars/virt27.qa.fedoraproject.org @@ -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 diff --git a/inventory/host_vars/virt28.qa.fedoraproject.org b/inventory/host_vars/virt28.qa.fedoraproject.org index d8c496a382..0c77421685 100644 --- a/inventory/host_vars/virt28.qa.fedoraproject.org +++ b/inventory/host_vars/virt28.qa.fedoraproject.org @@ -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 diff --git a/inventory/host_vars/virt29.qa.fedoraproject.org b/inventory/host_vars/virt29.qa.fedoraproject.org index 56033e0787..df5a47fed5 100644 --- a/inventory/host_vars/virt29.qa.fedoraproject.org +++ b/inventory/host_vars/virt29.qa.fedoraproject.org @@ -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 diff --git a/roles/taskotron/buildslave-configure/defaults/main.yml b/roles/taskotron/buildslave-configure/defaults/main.yml new file mode 100644 index 0000000000..cef18a0093 --- /dev/null +++ b/roles/taskotron/buildslave-configure/defaults/main.yml @@ -0,0 +1,2 @@ +--- +taskotron_admin_email: root@localhost.localdomain diff --git a/roles/taskotron/buildslave-configure/tasks/main.yml b/roles/taskotron/buildslave-configure/tasks/main.yml index 02ce5af6ee..0d30548907 100644 --- a/roles/taskotron/buildslave-configure/tasks/main.yml +++ b/roles/taskotron/buildslave-configure/tasks/main.yml @@ -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 diff --git a/roles/taskotron/buildslave-configure/templates/admin.j2 b/roles/taskotron/buildslave-configure/templates/admin.j2 index ae6c41affe..b963865b26 100644 --- a/roles/taskotron/buildslave-configure/templates/admin.j2 +++ b/roles/taskotron/buildslave-configure/templates/admin.j2 @@ -1 +1 @@ -Taskbot Admin +Taskotron Admin <{{ taskotron_admin_email }}> diff --git a/roles/taskotron/buildslave-configure/templates/buildbot.tac.j2 b/roles/taskotron/buildslave-configure/templates/buildbot.tac.j2 index 0385231c91..f65de3931a 100644 --- a/roles/taskotron/buildslave-configure/templates/buildbot.tac.j2 +++ b/roles/taskotron/buildslave-configure/templates/buildbot.tac.j2 @@ -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