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

removing more complexity from taskotron master template

Browse source
This commit is contained in:
Tim Flink 2016-01-21 16:05:09 +00:00
parent ef903862e8
commit a6ea2b7d49
3 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
inventory/group_vars/taskotron-dev
View file

@ -69,4 +69,5 @@ buildmaster_template: taskotron.master.cfg.j2
buildmaster_user: buildmaster
buildslave_port: 9989
buildslave_password: "{{ dev_buildslave_password }}"
buildslave_ssh_pubkey: 'ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA4EOTNfPIvIjCLNRYauVquS2LA8CZvCi6f87TASDZv4moFTv3mrCIdA3ycYLg+r+ODdPDjF9Cjpw1os/8L07XegTt9gAJVIpxzu3ZgQDkSQbx/hlDi+RG4EOIHL8nNJmu27dOVd1tb3k3aOkP5twO4uEq9RygrQBWMZTmOHdS/q8ZVUQG0d1sKv2J8EuBENgICjjIhhYvdvluu3G65jKxMgDbSXjkK6vZpbDbS2d6JI3VeLbVGlyFbHkTu7vH/vzTJZfOYgp0ZbvW9Wo3VSq/ia5qtrLKwRcBkpyCkP6uOQ14zqj4zJd/Hv7qhEcUhC8Jsb7d/Z6b3q5ID0s/9nuHdQ== tflink@lockbox01.phx2.fedoraproject.org'

4
inventory/group_vars/taskotron-stg
View file

@ -68,6 +68,6 @@ buildmaster_home: /srv/buildmaster
buildmaster_template: taskotron.master.cfg.j2
buildmaster_user: buildmaster
buildslave_dir: /home/buildslave/slave
buildslave_ssh_pubkey: 'ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAm+ClC0VWMBbRvTAzI+1H9jCnlB0xU+8jOKzemq9AdGThysaMPJA1OHSfcLPFvkOUTEj+xLrL3RN+z/XLozJAonTgh0uJmsTKwM/o5v5vxwY5oFENVYfGAEdDrDBFua0zGPHikV7mWTocmiIyYP2BMnNL9ugBTQZex5HQ4BVj6nFySE3ChQxvKTCv7TzJc3OiZuEng6eGN3SWa6kbmBe7eX+Nurw/suF2IwB7if/oTg2P+92zluLCjv0ERiU/ROmiqjUUHmD31dMnA01fqh+I5EMjHc8GOCC9D9CkoKPhbcQRyg4UTw5FGLVu3fqqHm16XQa7Nenwl0n9t+n8qz8Gdw== buildslave@taskotron-stg01.qa.fedoraproject.org'
buildslave_port: 9989
buildslave_password: "{{ dev_buildslave_password }}"
buildslave_ssh_pubkey: 'ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAm+ClC0VWMBbRvTAzI+1H9jCnlB0xU+8jOKzemq9AdGThysaMPJA1OHSfcLPFvkOUTEj+xLrL3RN+z/XLozJAonTgh0uJmsTKwM/o5v5vxwY5oFENVYfGAEdDrDBFua0zGPHikV7mWTocmiIyYP2BMnNL9ugBTQZex5HQ4BVj6nFySE3ChQxvKTCv7TzJc3OiZuEng6eGN3SWa6kbmBe7eX+Nurw/suF2IwB7if/oTg2P+92zluLCjv0ERiU/ROmiqjUUHmD31dMnA01fqh+I5EMjHc8GOCC9D9CkoKPhbcQRyg4UTw5FGLVu3fqqHm16XQa7Nenwl0n9t+n8qz8Gdw== buildslave@taskotron-stg01.qa.fedoraproject.org'

7
roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
View file

@ -16,11 +16,8 @@ c = BuildmasterConfig = {}
from buildbot.buildslave import BuildSlave
c['slaves'] = [
{% for buildslave in buildslaves %}
{% if deployment_type == 'dev' %}
BuildSlave("{{ buildslave }}", "{{ dev_buildslave_password }}"),
{% endif %}
{% if deployment_type == 'stg' %}
BuildSlave("{{ buildslave }}", "{{ stg_buildslave_password }}"),
{% if deployment_type in ['dev', 'stg'] %}
BuildSlave("{{ buildslave }}", "{{ buildslave_password }}"),
{% endif %}
{% if deployment_type == 'prod' %}
BuildSlave("{{ buildslave }}", "{{ prod_buildslave_password }}"),