From 4b2d68f5db93a93e364a59603309cc16dcf6996e Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 9 Mar 2018 09:33:36 -0500
Subject: [PATCH] fixup! tests: Dip our toes into using Ansible

---
 .papr.yml             |  1 +
 tests/common/libvm.sh | 15 +++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.papr.yml b/.papr.yml
index f771de2fd9..34a169fe9e 100644
--- a/.papr.yml
+++ b/.papr.yml
@@ -71,6 +71,7 @@ extra-repos:
 tests:
   # we're still on devmapper here; we need to expand rootfs for tests
   - for vm in vmcheck{1..3}; do ssh $vm lvresize -r -L +5G atomicos/root; done
+  - ci/vmcheck-provision.sh
   - yum install -y epel-release
   - ci/build-check.sh
   - make vmcheck
diff --git a/tests/common/libvm.sh b/tests/common/libvm.sh
index 61b38796c2..d0ba83301c 100644
--- a/tests/common/libvm.sh
+++ b/tests/common/libvm.sh
@@ -35,12 +35,15 @@ vm_setup() {
   export SSH="ssh $sshopts $VM"
   export SCP="scp $sshopts"
 
-  cat >${topsrcdir}/ansible-inventory.yml <<EOF
-all:
-  hosts:
-    ${VM}:
-      ansible_ssh_common_args: "${sshopts}"
-EOF
+  local HOSTS="${HOSTS:-${VM}}"
+  inventory=${topsrcdir}/ansible-inventory.ini
+  (echo '[vmcheck]' &&
+   for host in "${HOSTS}"; do
+       echo "${host}"
+   done &&
+   echo '[vmcheck:vars]' &&
+   echo 'ansible_ssh_common_args: "'${sshopts}'"'
+  ) > ${inventory}.new && mv ${inventory}{.new,}
 }
 
 vm_ansible_inline() {