diff --git a/inventory/builders b/inventory/builders index 7db15ff54b..f67429ae6e 100644 --- a/inventory/builders +++ b/inventory/builders @@ -28,6 +28,9 @@ buildvm-25.phx2.fedoraproject.org buildvm-26.phx2.fedoraproject.org buildvm-27.phx2.fedoraproject.org +[buildvm-stg] +buildvm-01.stg.phx2.fedoraproject.org + [buildvmhost] buildvmhost-10.phx2.fedoraproject.org buildvmhost-11.phx2.fedoraproject.org diff --git a/inventory/group_vars/buildvm-stg b/inventory/group_vars/buildvm-stg new file mode 100644 index 0000000000..a78cdc8d55 --- /dev/null +++ b/inventory/group_vars/buildvm-stg @@ -0,0 +1,29 @@ +--- +# common items for the buildvm-* koji builders +volgroup: /dev/vg_virthost16 +lvm_size: 150000 +mem_size: 10240 +num_cpus: 4 +ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-20 +ks_repo: http://10.5.126.23/pub/fedora/linux/releases/20/Fedora/x86_64/os/ +nm: 255.255.255.0 +gw: 10.5.126.254 +dns: 10.5.126.21 +eth0_ip: 10.5.126.14 +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 + "ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0 + hostname={{ inventory_hostname }} nameserver={{ dns }} + ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none + ip={{ eth1_ip }}:::{{ nm }}:{{ inventory_hostname }}-nfs:eth1:none" + --network=bridge=br0,model=virtio --network=bridge=br1,model=virtio + --autostart --noautoconsole + +# for systems that do not match the above - specify the same parameter in +# the host_vars/$hostname file +host_group: kojibuilder + +vmhost: virthost16.phx2.fedoraproject.org +datacenter: phx2 + diff --git a/inventory/host_vars/buildvm-01.stg.phx2.fedoraproject.org b/inventory/host_vars/buildvm-01.stg.phx2.fedoraproject.org new file mode 100644 index 0000000000..01b247abad --- /dev/null +++ b/inventory/host_vars/buildvm-01.stg.phx2.fedoraproject.org @@ -0,0 +1,3 @@ +--- +vmhost: bvirthost16.phx2.fedoraproject.org +eth0_ip: 10.5.126.14 diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index eaf6c1c357..c52e201f26 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -4,7 +4,7 @@ # NOTE: most of these vars_path come from group_vars/buildvm or from hostvars - name: make buildvm - hosts: buildvm + hosts: buildvm:buildvm-stg user: root gather_facts: False accelerate: "{{ accelerated }}" @@ -21,7 +21,7 @@ - include: "{{ handlers }}/restart_services.yml" - name: make koji builder(s) - hosts: buildvm + hosts: buildvm:buildvm-stg user: root gather_facts: True accelerate: "{{ accelerated }}"