Consolidate all our virt_install_commands down to just two in group_vars/all.

Also tweak them with some more features, namely to set maxram and maxvcpus so we can
increase on the fly.

inventory/group_vars/all

@@ -34,23 +34,33 @@ mem_size: 2048
 num_cpus: 2
 lvm_size: 20000
 
-# default virt install command is for a single nic-device
+#
-# define in another group file for more nics (see buildvm)
+# The default virt-install works for rhel7 or fedora with 1 nic
-#virt_install_command: /usr/sbin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }} 
+#
-#                 --disk {{ volgroup }}/{{ inventory_hostname }}
+virt_install_command: "{{ virt_install_command_one_nic }}"
-#                 --vcpus={{ num_cpus }}  -l {{ ks_repo }} -x 
-#                 "ksdevice=eth0 ks={{ ks_url }} ip={{ eth0_ip }} netmask={{ nm }} 
-#                  gateway={{ gw }} dns={{ dns }} console=tty0 console=ttyS0
-#                  hostname={{ inventory_hostname }}" 
-#                 --network=bridge=br0 --autostart --noautoconsole
 
-virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
+main_bridge: br0
+nfs_bridge: br1
+
+virt_install_command_one_nic: virt-install -n {{ inventory_hostname }} 
+                 --memory={{ mem_size }},maxmemory={{ mem_size * 2 }} --memballoon virtio
                  --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
-                 --vcpus={{ num_cpus }}  -l {{ ks_repo }} -x
+                 --vcpus={{ num_cpus }},maxvcpus={{ num_cpus * 2 }}  -l {{ ks_repo }} -x
-                 'ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0
+                 'net.ifnames=0 ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0
                   hostname={{ inventory_hostname }} nameserver={{ dns }}
                   ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none'
-                 --network bridge=br0,model=virtio
+                 --network bridge={{ main_bridge }},model=virtio
+                 --autostart --noautoconsole --watchdog default
+
+virt_install_command_two_nic: virt-install -n {{ inventory_hostname }} 
+                 --memory={{ mem_size }},maxmemory={{ mem_size * 2 }} --memballoon virtio
+                 --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
+                 --vcpus={{ num_cpus }},maxvcpus={{ num_cpus * 2 }}  -l {{ ks_repo }} -x
+                 'net.ifnames=0 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={{ main_bridge }},model=virtio --network=bridge={{ nfs_bridge }},model=virtio
                  --autostart --noautoconsole --watchdog default
 
 # This is the wildcard certname for our proxies.  It has a different name for

inventory/group_vars/bodhi-backend

@@ -10,15 +10,7 @@ dns: 10.5.126.21
 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 }}
+virt_install_command: "{{ virt_install_command_two_nic }}"
-                 --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
 
 # These are for fedmsg publication from the bodhi backend.
 # If you change these iptables rules, you also need to changes the endpoints

inventory/group_vars/bodhi-backend-stg

@@ -10,15 +10,6 @@ dns: 10.5.126.21
 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 }} netmask={{ nm }} gateway={{ gw }} dns={{ dns }}"
-                 --network=bridge=br0,model=virtio --network=bridge=br1,model=virtio
-                 --autostart --noautoconsole
-
 # These are for fedmsg publication from the bodhi backend.
 # If you change these iptables rules, you also need to changes the endpoints
 # list in roles/fedmsg/base/templates/endpoints-bodhi.py

inventory/group_vars/buildppc

@@ -9,16 +9,13 @@ ks_repo: http://10.5.126.23/pub/fedora-secondary/releases/23/Server/ppc64/os/
 nm: 255.255.255.0
 gw: 10.5.125.254
 dns: 10.5.126.21
-virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
+
-                 --graphics none --serial pty
+#
-                 --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
+# The ppc virthosts have different bridge names for the main and nfs bridges.
-                 --vcpus={{ num_cpus }}  -l {{ ks_repo }} -x
+#
-                 "net.ifnames=0 ksdevice=eth0 ks={{ ks_url }} console=tty0 console=hvc0
+main_bridge: br3
-                  hostname={{ inventory_hostname }} nameserver={{ dns }} 
+nfs_bridge: br2
-                  ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none
+virt_install_command: "{{ virt_install_command_two_nic }}"
-                  ip={{ eth1_ip }}:::{{ nm }}:{{ inventory_hostname }}-nfs:eth1:none"
-                 --network=bridge=br3,model=virtio  --network=bridge=br2,model=virtio 
-                 --autostart --noautoconsole; sleep 5
 
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file

inventory/group_vars/buildppcle

@@ -9,16 +9,12 @@ ks_repo: http://10.5.126.23/pub/fedora-secondary/releases/23/Server/ppc64le/os/
 nm: 255.255.255.0
 gw: 10.5.125.254
 dns: 10.5.126.21
-virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
+#
-                 --graphics none --serial pty
+# The ppc virthosts have different bridge names for the main and nfs bridges.
-                 --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
+#
-                 --vcpus={{ num_cpus }}  -l {{ ks_repo }} -x
+main_bridge: br3
-                 "net.ifnames=0 ksdevice=eth0 ks={{ ks_url }} console=tty0 console=hvc0
+nfs_bridge: br2
-                  hostname={{ inventory_hostname }} nameserver={{ dns }} 
+virt_install_command: "{{ virt_install_command_two_nic }}"
-                  ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none
-                  ip={{ eth1_ip }}:::{{ nm }}:{{ inventory_hostname }}-nfs:eth1:none"
-                 --network=bridge=br3,model=virtio  --network=bridge=br2,model=virtio 
-                 --autostart --noautoconsole; sleep 5
 
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file

inventory/group_vars/buildvm

@@ -10,15 +10,7 @@ nm: 255.255.255.0
 gw: 10.5.125.254
 eth1_gw: 10.5.127.254
 dns: 10.5.126.21
-virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
+virt_install_command: "{{ virt_install_command_two_nic }}"
-                 --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
-                 --vcpus={{ num_cpus }}  -l {{ ks_repo }} -x
-                 "net.ifnames=0 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; sleep 5
 
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file

inventory/group_vars/buildvm-ppc64

@@ -9,14 +9,6 @@ ks_repo: http://10.5.126.23/pub/fedora-secondary/releases/23/Server/ppc64/os/
 nm: 255.255.255.128
 gw: 10.5.124.254
 dns: 10.5.126.21
-virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
-                 --graphics none --serial pty
-                 --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
-                 --vcpus={{ num_cpus }}  -l {{ ks_repo }} -x
-                 "net.ifnames=0 ksdevice=eth0 ks={{ ks_url }} console=tty0 console=hvc0
-                  hostname={{ inventory_hostname }} nameserver={{ dns }} 
-                  ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none" 
-                 --network=bridge=br0,model=virtio --autostart --noautoconsole; sleep 5
 
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file

inventory/group_vars/buildvm-ppc64le

@@ -9,14 +9,6 @@ ks_repo: http://10.5.126.23/pub/fedora-secondary/releases/23/Server/ppc64le/os/
 nm: 255.255.255.128
 gw: 10.5.124.254
 dns: 10.5.126.21
-virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
-                 --graphics none --serial pty
-                 --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
-                 --vcpus={{ num_cpus }}  -l {{ ks_repo }} -x
-                 "net.ifnames=0 ksdevice=eth0 ks={{ ks_url }} console=tty0 console=hvc0
-                  hostname={{ inventory_hostname }} nameserver={{ dns }} 
-                  ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none" 
-                 --network=bridge=br0,model=virtio --autostart --noautoconsole; sleep 5
 
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file

inventory/group_vars/buildvm-stg

@@ -9,14 +9,6 @@ ks_repo: http://10.5.126.23/pub/fedora/linux/releases/23/Server/x86_64/os/
 nm: 255.255.255.0
 gw: 10.5.126.254
 dns: 10.5.126.21
-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
-                 "net.ifnames=0 ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0 
-                  hostname={{ inventory_hostname }} nameserver={{ dns }} 
-                  ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0: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

inventory/group_vars/composers

@@ -9,16 +9,7 @@ dns: 10.5.126.21
 
 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_command_two_nic }}"
-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

inventory/group_vars/koji

@@ -42,13 +42,4 @@ fedmsg_certs:
   - buildsys.untag
 
 nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
-
+virt_install_command: "{{ virt_install_command_two_nic }}"
-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

inventory/group_vars/kojipkgs

@@ -32,13 +32,4 @@ csi_relationship: |
       - koschei
       - external users downloading packages from koji. 
 
-# Need a eth0/eth1 install here. 
+virt_install_command: "{{ virt_install_command_two_nic }}"
-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

inventory/group_vars/mailman-stg

@@ -26,16 +26,6 @@ fedmsg_certs:
   can_send:
   - mailman.receive
 
-# default virt install command is for a single nic-device
-# define in another group file for more nics (see buildvm)
-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 }} ip={{ eth0_ip }} netmask={{ nm }}
-                  gateway={{ gw }} dns={{ dns }} console=tty0 console=ttyS0
-                  hostname={{ inventory_hostname }}"
-                 --network=bridge=br0 --autostart --noautoconsole
-
 # Postfix main.cf
 postfix_group: mailman-stg
 

inventory/group_vars/releng

@@ -10,15 +10,7 @@ dns: 10.5.126.21
 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 }}
+virt_install_command: "{{ virt_install_command_two_nic }}"
-                 --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

inventory/group_vars/resultsdb-prod

@@ -11,14 +11,6 @@ fas_client_groups: sysadmin-qa
 nrpe_procs_warn: 250
 nrpe_procs_crit: 300
 
-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"
-                 --network=bridge=br0,model=virtio --autostart --noautoconsole
-
 deployment_type: prod
 
 resultsdb_db_host_machine: db-qa01.qa.fedoraproject.org

inventory/host_vars/arm-koji01.qa.fedoraproject.org

@@ -25,14 +25,7 @@ sudoers: "{{ private }}/files/sudo/sysadmin-secondary-sudoers"
 #
 # define this here because arm koji only needs eth0, not eth1 also
 #
-virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
+virt_install_command: "{{ virt_install_command_one_nic }}"
-                 --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"
-                 --network=bridge=br0,model=virtio
-                 --autostart --noautoconsole
 
 koji_topurl: "http://arm.fedoraproject.org/"
 koji_server_url: "http://arm.koji.fedoraproject.org/kojihub"

inventory/host_vars/batcave01.phx2.fedoraproject.org

@@ -21,12 +21,4 @@ host_backup_targets: ['/git', '/mnt/fedora/app/attachments']
 #
 # We need this to install with 2 nics
 #
-virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
+virt_install_command: "{{ virt_install_command_two_nic }}"
-                 --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

inventory/host_vars/compose-x86-01.phx2.fedoraproject.org

@@ -9,15 +9,7 @@ libdir: /usr/lib64
 
 ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-21
 ks_repo: http://10.5.126.23/pub/fedora/linux/releases/21/Server/x86_64/os/
-virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
+virt_install_command: "{{ virt_install_command_two_nic }}"
-                 --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
 
 lvm_size: 30000
 mem_size: 8192

inventory/host_vars/composer.stg.phx2.fedoraproject.org

@@ -19,15 +19,7 @@ kojihub_scheme: http
 
 nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4
 
-virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
+virt_install_command: "{{ virt_install_command_two_nic }}"
-                 --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
-                 --vcpus={{ num_cpus }}  -l {{ ks_repo }} -x
-                 "net.ifnames=0 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
 
 # These are consumed by a task in roles/fedmsg/base/main.yml
 fedmsg_certs:

inventory/host_vars/download-ib02.fedoraproject.org

@@ -18,11 +18,3 @@ nrpe_procs_crit: 1000
 lvm_size: 20000
 mem_size: 8192
 num_cpus: 4
-
-virt_install_command: /usr/sbin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }} 
-                 --disk {{ volgroup }}/{{ inventory_hostname }}
-                 --vcpus={{ num_cpus }}  -l {{ ks_repo }} -x 
-                 "ksdevice=eth0 ks={{ ks_url }} ip={{ eth0_ip }} netmask={{ nm }} 
-                  gateway={{ gw }} dns={{ dns }} console=tty0 console=ttyS0
-                  hostname={{ inventory_hostname }}" 
-                 --network=bridge=br0 --autostart --noautoconsole

inventory/host_vars/gnome-backups01.phx2.fedoraproject.org

@@ -14,15 +14,7 @@ ks_repo: http://infrastructure.phx2.fedoraproject.org/repo/rhel/RHEL7-x86_64/
 #
 # Need a virt-install command with eth1 also
 #
-virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
+virt_install_command: "{{ virt_install_command_two_nic }}"
-                 --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
 
 lvm_size: 30000
 mem_size: 8192

inventory/host_vars/mdapi01.phx2.fedoraproject.org

@@ -10,12 +10,3 @@ volgroup: /dev/vg_bvirthost09
 eth0_ip: 10.5.125.50
 vmhost: bvirthost09.phx2.fedoraproject.org
 datacenter: phx2
-
-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
-                 'net.ifnames=0 ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0
-                  hostname={{ inventory_hostname }} nameserver={{ dns }}
-                  ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none'
-                 --network bridge=br0,model=virtio
-                 --autostart --noautoconsole --watchdog default 

inventory/host_vars/mdapi01.stg.phx2.fedoraproject.org

@@ -10,12 +10,3 @@ volgroup: /dev/vg_guests
 eth0_ip: 10.5.126.206
 vmhost: virthost11.phx2.fedoraproject.org
 datacenter: phx2
-
-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
-                 'net.ifnames=0 ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0
-                  hostname={{ inventory_hostname }} nameserver={{ dns }}
-                  ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none'
-                 --network bridge=br0,model=virtio
-                 --autostart --noautoconsole --watchdog default 

inventory/host_vars/mm-backend01.phx2.fedoraproject.org

@@ -16,12 +16,4 @@ datacenter: phx2
 nfs_mount_opts: "ro,hard,bg,intr,nodev,nosuid,nfsvers=3"
 
 # We define this here to override the global one because we need eth1
-virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
+virt_install_command: "{{ virt_install_command_two_nic }}"
-                 --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

inventory/host_vars/mm-backend01.stg.phx2.fedoraproject.org

@@ -17,12 +17,4 @@ datacenter: phx2
 nfs_mount_opts: "ro,hard,bg,intr,nodev,nosuid,nfsvers=3"
 
 # We define this here to override the global one because we need eth1
-virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
+virt_install_command: "{{ virt_install_command_two_nic }}"
-                 --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

inventory/host_vars/openqa-stg01.qa.fedoraproject.org

@@ -30,12 +30,3 @@ num_cpus: 4
 
 nrpe_procs_warn: 250
 nrpe_procs_crit: 300
-
-virt_install_command: /usr/bin/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
-                  net.ifnames=0"
-                 --network=bridge=br0,model=virtio --autostart --noautoconsole

inventory/host_vars/openqa01.qa.fedoraproject.org

@@ -30,12 +30,3 @@ num_cpus: 4
 
 nrpe_procs_warn: 250
 nrpe_procs_crit: 300
-
-virt_install_command: /usr/bin/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
-                  net.ifnames=0"
-                 --network=bridge=br0,model=virtio --autostart --noautoconsole

inventory/host_vars/pkgs02.phx2.fedoraproject.org

@@ -14,15 +14,7 @@ mem_size: 16384
 num_cpus: 8
 
 # Need a eth0/eth1 install here. 
-virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
+virt_install_command: "{{ virt_install_command_two_nic }}"
-                 --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
 
 host_backup_targets: ['/srv']
 nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"

inventory/host_vars/qa-stg01.qa.fedoraproject.org

@@ -10,17 +10,6 @@ vmhost: virthost-comm04.qa.fedoraproject.org
 datacenter: phx2
 fas_client_groups: sysadmin-qa,sysadmin-main
 
-# default virt install command is for a single nic-device
-# define in another group file for more nics (see buildvm)
-virt_install_command: /usr/bin/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
-                  net.ifnames=0"
-                 --network=bridge=br0,model=virtio --autostart --noautoconsole
-
 mariadb_root_password: "{{ qa_stg_mariadb_root_password }}"
 
 public_hostname: qa.stg.fedoraproject.org

inventory/host_vars/qadevel.qa.fedoraproject.org

@@ -11,17 +11,6 @@ datacenter: phx2
 
 fas_client_groups: sysadmin-qa,sysadmin-main
 
-# default virt install command is for a single nic-device
-# define in another group file for more nics (see buildvm)
-virt_install_command: /usr/bin/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
-                  net.ifnames=0"
-                 --network=bridge=br0,model=virtio --autostart --noautoconsole
-
 mariadb_root_password: "{{ qadevel_mariadb_root_password }}"
 
 public_hostname: qadevel.qa.fedoraproject.org

inventory/host_vars/resultsdb-dev01.qa.fedoraproject.org

@@ -20,16 +20,6 @@ volgroup: /dev/VirtGuests
 vmhost: virthost-comm02.qa.fedoraproject.org
 datacenter: phx2
 
-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
-                  net.ifnames=0"
-                 --network=bridge=br0,model=virtio --autostart --noautoconsole
-
-
 ############################################################
 # virtual machine
 ############################################################

inventory/host_vars/resultsdb-stg01.qa.fedoraproject.org

@@ -20,15 +20,6 @@ volgroup: /dev/vg_guests
 vmhost: virthost-comm04.qa.fedoraproject.org
 datacenter: phx2
 
-virt_install_command: /usr/bin/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
-
-
 ############################################################
 # virtual machine
 ############################################################

inventory/host_vars/resultsdb01.qa.fedoraproject.org

@@ -19,16 +19,6 @@ volgroup: /dev/VirtGuests
 datacenter: phx2
 vmhost: virthost-comm03.qa.fedoraproject.org
 
-# default virt install command is for a single nic-device
-# define in another group file for more nics (see buildvm)
-virt_install_command: /usr/bin/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
-
 ############################################################
 # virtual machine
 ############################################################

inventory/host_vars/s390-koji01.qa.fedoraproject.org

@@ -25,14 +25,7 @@ sudoers: "{{ private }}/files/sudo/sysadmin-secondary-sudoers"
 #
 # define this here because s390 koji only needs eth0, not eth1 also
 #
-virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
+virt_install_command: "{{ virt_install_command_one_nic }}"
-                 --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"
-                 --network=bridge=br0,model=virtio --network=bridge=br1,model=virtio
-                 --autostart --noautoconsole
 
 koji_topurl: "http://s390pkgs.fedoraproject.org/"
 koji_server_url: "http://s390.koji.fedoraproject.org/kojihub"

inventory/host_vars/secondary01.phx2.fedoraproject.org

@@ -18,12 +18,4 @@ vmhost: virthost02.phx2.fedoraproject.org
 datacenter: phx2
 
 # We define this here to override the global one because we need eth1
-virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
+virt_install_command: "{{ virt_install_command_two_nic }}"
-                 --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

inventory/host_vars/taskotron-dev01.qa.fedoraproject.org

@@ -31,15 +31,6 @@ num_cpus: 4
 nrpe_procs_warn: 250
 nrpe_procs_crit: 300
 
-virt_install_command: /usr/bin/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
-                  net.ifnames=0"
-                 --network=bridge=br0,model=virtio --autostart --noautoconsole
-
 ############################################################
 # taskotron master
 ############################################################

inventory/host_vars/taskotron-stg01.qa.fedoraproject.org

@@ -33,15 +33,6 @@ num_cpus: 4
 nrpe_procs_warn: 250
 nrpe_procs_crit: 300
 
-virt_install_command: /usr/bin/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
-
-
 ############################################################
 # taskotron master
 ############################################################

inventory/host_vars/taskotron01.qa.fedoraproject.org

@@ -25,16 +25,6 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 vmhost: virthost-comm03.qa.fedoraproject.org
 volgroup: /dev/VirtGuests
 
-# default virt install command is for a single nic-device
-# define in another group file for more nics (see buildvm)
-virt_install_command: /usr/bin/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
-
 ############################################################
 # virtual machine
 ############################################################