From f34d329d735726e2c2d42f7d45154001683df7e8 Mon Sep 17 00:00:00 2001
From: Tim Flink <tflink@fedoraproject.org>
Date: Wed, 30 Sep 2015 22:09:57 +0000
Subject: [PATCH] stop trying to be fancy with the virt-install commands

---
 .../resultsdb-dev01.qa.fedoraproject.org        | 17 +++++++----------
 .../taskotron-dev01.qa.fedoraproject.org        | 16 +++++++---------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/inventory/host_vars/resultsdb-dev01.qa.fedoraproject.org b/inventory/host_vars/resultsdb-dev01.qa.fedoraproject.org
index 6b29cbc9ed..6a832cb8c1 100644
--- a/inventory/host_vars/resultsdb-dev01.qa.fedoraproject.org
+++ b/inventory/host_vars/resultsdb-dev01.qa.fedoraproject.org
@@ -26,7 +26,6 @@ datacenter: phx2
 ############################################################
 
 fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice
-
 lvm_size: 50000
 mem_size: 4096
 num_cpus: 4
@@ -34,13 +33,11 @@ num_cpus: 4
 nrpe_procs_warn: 250
 nrpe_procs_crit: 300
 
-virt_install_bin: "/usr/sbin/virt-install"
-virt_install_command: |
-  {{ virt_install_bin }} -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
+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
 
diff --git a/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org b/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org
index 1f48e5fa11..6a9bc86b7a 100644
--- a/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org
+++ b/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org
@@ -31,15 +31,13 @@ num_cpus: 4
 nrpe_procs_warn: 250
 nrpe_procs_crit: 300
 
-virt_install_bin: "/usr/bin/virt-install"
-virt_install_command: |
-  {{ virt_install_command }} -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
+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"
+                 --network=bridge=br0,model=virtio --autostart --noautoconsole
 
 ############################################################
 # taskotron master