Merge branch 'master' of /git/ansible

This commit is contained in:
Kevin Fenzi 2014-06-25 20:41:55 +00:00
commit 8ca70c59d1
4 changed files with 123 additions and 0 deletions

View file

@ -0,0 +1,23 @@
---
grokmirror_basedir: /var/lib/git/mirror
grokmirror_user: grokmirror
grokmirror_repos:
- { name: fedoraqa/rpmlint, url: 'https://bitbucket.org/fedoraqa/task-rpmlint.git'}
- { name: fedoraqa/depcheck, url: 'https://bitbucket.org/fedoraqa/task-depcheck.git'}
- { name: fedoraqa/examplelong, url: 'https://bitbucket.org/fedoraqa/task-examplelong.git'}
- { name: fedoraqa/examplebodhi, url: 'https://bitbucket.org/fedoraqa/task-examplebodhi.git'}
- { name: fedoraqa/upgradepath, url: 'https://bitbucket.org/fedoraqa/task-upgradepath.git'}
buildslave_ssh_pubkey: ''
settings_dir: /etc/taskotron
buildmaster_db_host: db-qa01.qa.fedoraproject.org
buildmaster_db_name: buildmaster
buildmaster_template: taskotron.master.cfg.j2
buildmaster_endpoint: taskmaster
buildmaster_pubkey: ''
buildslave_port: 9989
cgit_root_title: "Taskotron Dev Server Git Mirror"
buildmaster_dir: /home/buildmaster/master
buildslave_dir: /home/buildslave/slave
master_dir: /home/buildmaster/master
master_user: buildmaster
external_hostname: taskotron.dev.fedoraproject.org

View file

@ -18,3 +18,16 @@ virt_install_command: /usr/sbin/virt-install -n {{ inventory_hostname }} -r {{ m
gateway={{ gw }} dns={{ dns }} console=tty0 console=ttyS0
hostname={{ inventory_hostname }}"
--network=bridge=br0 --autostart --noautoconsole
buildmaster: 10.5.124.142
buildslaves:
- virt26
- virt27
- virt28
- virt29
i386_buildslaves:
- virt27
- virt29
x86_64_buildslaves:
- virt26
- virt28

View file

@ -0,0 +1,84 @@
---
# create a new taskotron dev server
# NOTE: make sure there is room/space for this server on the vmhost
# NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars
- name: make resultsdb staging
hosts: taskotron_dev
user: root
gather_facts: False
accelerate: "{{ accelerated }}"
vars_files:
- /srv/web/infra/ansible/vars/global.yml
- "{{ private }}/vars.yml"
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
tasks:
- include: "{{ tasks }}/virt_instance_create.yml"
handlers:
- include: "{{ handlers }}/restart_services.yml"
- name: make the box be real
hosts: taskotron-dev
user: root
gather_facts: True
accelerate: "{{ accelerated }}"
vars_files:
- /srv/web/infra/ansible/vars/global.yml
- "{{ private }}/vars.yml"
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles:
- { role: base, tags:['base'] }
- { role: rkhunter, tags:['rkhunter'] }
- { role: nagios_client, tags:['nagios_client'] }
- hosts
- { role: fas_client, tags:['fas_client'] }
- { role: collectd/base, tags:['collectd_base'] }
- { role: yum-cron, tags:['yumcron'] }
- { role: sudo, tags:['sudo'] }
# - { role: taskotron/grokmirror, tags: ['grokmirror'] }
# - { role: taskotron/cgit, tags: ['cgit'] }
# - { role: taskotron/buildmaster, tags: ['buildmaster'] }
# - { role: taskotron/taskotron-trigger, tags: ['trigger'] }
# - { role: taskotron/taskotron-frontend, tags: ['frontend'] }
tasks:
# this is how you include other task lists
- include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
handlers:
- include: "{{ handlers }}/restart_services.yml"
############################################################
# buildbot master setup
#
# Since the buildmaster runs as non-root, do the config as
# the appropriate non-root user
############################################################
- name: buildbot master setup
hosts: taskotron-dev
sudo: yes
sudo_user: "{{ master_user }}"
tags:
- buildmasterconfig
# this eventually needs to differentiate between staging and production cedrts
vars_files:
- /srv/web/infra/ansible/vars/global.yml
- "{{ private }}/vars.yml"
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
tasks:
- include: "{{ tasks }}/buildmaster-config.yml"
handlers:
- include: "{{ handlers }}/restart_services.yml"

View file

@ -36,6 +36,9 @@
- name: mount up disk of copr repo
action: mount name=/var/lib/copr/public_html src='LABEL=copr-repo' fstype=ext4 state=mounted
- name: mount /tmp/
action: mount name=/tmp src='tmpfs' fstype=tmpfs state=mounted
# We cannot use repo pointing to ourselfs :(
#- name: copy copr.repo
# action: copy src=$files/copr/fe/yum/copr.repo dest=/etc/yum.repos.d/copr.repo