From 95ab9037c264ce8cb1f2aaba305cee12a88d98ff Mon Sep 17 00:00:00 2001
From: Tim Flink <tflink@fedoraproject.org>
Date: Wed, 30 Sep 2015 22:08:02 +0000
Subject: [PATCH] account for different virt-install var locations

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

diff --git a/inventory/host_vars/resultsdb-dev01.qa.fedoraproject.org b/inventory/host_vars/resultsdb-dev01.qa.fedoraproject.org
index 5f8d209141..6b29cbc9ed 100644
--- a/inventory/host_vars/resultsdb-dev01.qa.fedoraproject.org
+++ b/inventory/host_vars/resultsdb-dev01.qa.fedoraproject.org
@@ -34,11 +34,13 @@ num_cpus: 4
 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
+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
 
diff --git a/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org b/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org
index 38189b3fe4..1f48e5fa11 100644
--- a/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org
+++ b/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org
@@ -31,13 +31,15 @@ num_cpus: 4
 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
+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
 
 ############################################################
 # taskotron master