diff --git a/inventory/group_vars/qadevel b/inventory/group_vars/qadevel index 010befc04c..d4d560abe5 100644 --- a/inventory/group_vars/qadevel +++ b/inventory/group_vars/qadevel @@ -11,16 +11,6 @@ fas_client_groups: sysadmin-qa 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_template: ci.master.cfg.j2 buildmaster_endpoint: buildmaster diff --git a/playbooks/groups/qadevel.yml b/playbooks/groups/qadevel.yml index a029d976ba..8e34225d52 100644 --- a/playbooks/groups/qadevel.yml +++ b/playbooks/groups/qadevel.yml @@ -49,36 +49,36 @@ handlers: - include: "{{ handlers }}/restart_services.yml" -- name: configure taskotron-ci master - hosts: qadevel - user: root - gather_facts: True - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - roles: - - { role: taskotron/buildmaster, tags: ['buildmaster'] } - - { role: taskotron/buildmaster-configure, tags: ['buildmasterconfig'] } - - handlers: - - include: "{{ handlers }}/restart_services.yml" - -- name: configure taskotron-ci local slave - hosts: qadevel - user: root - gather_facts: True - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - roles: - - { role: taskotron/buildslave, tags: ['buildslave'] } - - { role: taskotron/buildslave-configure, tags: ['buildslaveconfig'] } - - handlers: - - include: "{{ handlers }}/restart_services.yml" +#- name: configure taskotron-ci master +# hosts: qadevel +# user: root +# gather_facts: True +# +# vars_files: +# - /srv/web/infra/ansible/vars/global.yml +# - "/srv/private/ansible/vars.yml" +# - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml +# +# roles: +# - { role: taskotron/buildmaster, tags: ['buildmaster'] } +# - { role: taskotron/buildmaster-configure, tags: ['buildmasterconfig'] } +# +# handlers: +# - include: "{{ handlers }}/restart_services.yml" +# +#- name: configure taskotron-ci local slave +# hosts: qadevel +# user: root +# gather_facts: True +# +# vars_files: +# - /srv/web/infra/ansible/vars/global.yml +# - "/srv/private/ansible/vars.yml" +# - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml +# +# roles: +# - { role: taskotron/buildslave, tags: ['buildslave'] } +# - { role: taskotron/buildslave-configure, tags: ['buildslaveconfig'] } +# +# handlers: +# - include: "{{ handlers }}/restart_services.yml"