disabling stuff not needed on qadevel right now

This commit is contained in:
Tim Flink 2015-05-05 19:37:01 +00:00
parent db246deed5
commit 8210ae2604
2 changed files with 33 additions and 43 deletions

View file

@ -11,16 +11,6 @@ fas_client_groups: sysadmin-qa
host_group: qadevel host_group: qadevel
# default virt install command is for a single nic-device
# define in another group file for more nics (see buildvm)
virt_install_command: /usr/sbin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
--disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
--vcpus={{ num_cpus }} -l {{ ks_repo }} -x
"ks={{ ks_url }} ip={{ eth0_ip }} netmask={{ nm }}
gateway={{ gw }} dns={{ dns }} console=tty0 console=ttyS0
hostname={{ inventory_hostname }}"
--network=bridge=br0 --autostart --noautoconsole
buildmaster_db_host: localhost buildmaster_db_host: localhost
buildmaster_template: ci.master.cfg.j2 buildmaster_template: ci.master.cfg.j2
buildmaster_endpoint: buildmaster buildmaster_endpoint: buildmaster

View file

@ -49,36 +49,36 @@
handlers: handlers:
- include: "{{ handlers }}/restart_services.yml" - include: "{{ handlers }}/restart_services.yml"
- name: configure taskotron-ci master #- name: configure taskotron-ci master
hosts: qadevel # hosts: qadevel
user: root # user: root
gather_facts: True # gather_facts: True
#
vars_files: # vars_files:
- /srv/web/infra/ansible/vars/global.yml # - /srv/web/infra/ansible/vars/global.yml
- "/srv/private/ansible/vars.yml" # - "/srv/private/ansible/vars.yml"
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml # - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
#
roles: # roles:
- { role: taskotron/buildmaster, tags: ['buildmaster'] } # - { role: taskotron/buildmaster, tags: ['buildmaster'] }
- { role: taskotron/buildmaster-configure, tags: ['buildmasterconfig'] } # - { role: taskotron/buildmaster-configure, tags: ['buildmasterconfig'] }
#
handlers: # handlers:
- include: "{{ handlers }}/restart_services.yml" # - include: "{{ handlers }}/restart_services.yml"
#
- name: configure taskotron-ci local slave #- name: configure taskotron-ci local slave
hosts: qadevel # hosts: qadevel
user: root # user: root
gather_facts: True # gather_facts: True
#
vars_files: # vars_files:
- /srv/web/infra/ansible/vars/global.yml # - /srv/web/infra/ansible/vars/global.yml
- "/srv/private/ansible/vars.yml" # - "/srv/private/ansible/vars.yml"
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml # - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
#
roles: # roles:
- { role: taskotron/buildslave, tags: ['buildslave'] } # - { role: taskotron/buildslave, tags: ['buildslave'] }
- { role: taskotron/buildslave-configure, tags: ['buildslaveconfig'] } # - { role: taskotron/buildslave-configure, tags: ['buildslaveconfig'] }
#
handlers: # handlers:
- include: "{{ handlers }}/restart_services.yml" # - include: "{{ handlers }}/restart_services.yml"