Move this stuff into the group file to save some duplication.

inventory/group_vars/releng

@@ -1,24 +1,30 @@
 ---
 # common items for the releng-* boxes
 lvm_size: 100000
-mem_size: 20480
+volgroup: /dev/xenGuests
-num_cpus: 4
+mem_size: 16384
-ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-el-6
+num_cpus: 16
-ks_repo: http://10.5.126.23/repo/rhel/RHEL6-x86_64/
 nm: 255.255.255.0
 gw: 10.5.125.254
 dns: 10.5.126.21
-volgroup: /dev/vg_host01
+
-virt_install_command: /usr/sbin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }} 
+ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7
-                 --disk {{ volgroup }}/{{ inventory_hostname }}
+ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/
-                 --vcpus={{ num_cpus }}  -l {{ ks_repo }} -x 
+
-                 "ksdevice=eth0 ks={{ ks_url }} ip={{ eth0_ip }} netmask={{ nm }} 
+virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
-                  gateway={{ gw }} dns={{ dns }} console=tty0 console=ttyS0" 
+                 --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
-                 --network=bridge=br0 --network=bridge=br1 --graphics none 
+                 --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
+# With 16 cpus, theres a bunch more kernel threads
-# the host_vars/$hostname file
+nrpe_procs_warn: 900
+nrpe_procs_crit: 1000
+
 host_group: releng
 
 # These are consumed by a task in roles/fedmsg/base/main.yml

inventory/host_vars/branched-composer.phx2.fedoraproject.org

@@ -2,22 +2,3 @@
 vmhost: bvirthost08.phx2.fedoraproject.org
 eth0_ip: 10.5.125.66
 eth1_ip: 10.5.127.53
-volgroup: /dev/xenGuests
-mem_size: 16384
-num_cpus: 16
-ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7
-ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/
-
-virt_install_command: 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
-
-# With 16 cpus, theres a bunch more kernel threads
-nrpe_procs_warn: 900
-nrpe_procs_crit: 1000

inventory/host_vars/rawhide-composer.phx2.fedoraproject.org

@@ -1,22 +1,3 @@
 vmhost: bvirthost06.phx2.fedoraproject.org
 eth0_ip: 10.5.125.69
 eth1_ip: 10.5.127.54
-volgroup: /dev/xenGuests
-mem_size: 16384
-num_cpus: 16
-ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7
-ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/
-
-virt_install_command: 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
-
-# With 16 cpus, theres a bunch more kernel threads
-nrpe_procs_warn: 900
-nrpe_procs_crit: 1000