From d23658aaf61505af7243a3de4d56b7c0e9b743b2 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Fri, 11 Jan 2019 19:34:51 +0000
Subject: [PATCH] Update stackhpc.libvirt-vm and stackhpc.libvirt-host roles

Update libvirt-host to 1.3.0
Update libvirt-vm to 1.6.0

These bring in support for non-hardware accelerated VMs, amongst other
things.

Change-Id: I46a0a63092321ce8ec271563fe259a66fa0e2a7b
---
 ansible/seed-vm-provision.yml | 14 ++++++++------
 requirements.yml              |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ansible/seed-vm-provision.yml b/ansible/seed-vm-provision.yml
index 18a74c7d1..581f2c018 100644
--- a/ansible/seed-vm-provision.yml
+++ b/ansible/seed-vm-provision.yml
@@ -99,13 +99,15 @@
         device: "cdrom"
         format: "raw"
         image: "{{ seed_vm_configdrive_path }}"
-      libvirt_vm_name: "{{ hostvars[seed_host].seed_vm_name }}"
-      libvirt_vm_memory_mb: "{{ hostvars[seed_host].seed_vm_memory_mb }}"
-      libvirt_vm_vcpus: "{{ hostvars[seed_host].seed_vm_vcpus }}"
-      libvirt_vm_volumes: "{{ hostvars[seed_host].seed_vm_volumes + [seed_vm_configdrive_volume] }}"
-      libvirt_vm_interfaces: >
-        {{ hostvars[seed_host].network_interfaces | map('net_libvirt_vm_network') | list }}
       libvirt_vm_image_cache_path: "{{ image_cache_path }}"
+      libvirt_vms:
+        - name: "{{ hostvars[seed_host].seed_vm_name }}"
+          memory_mb: "{{ hostvars[seed_host].seed_vm_memory_mb }}"
+          vcpus: "{{ hostvars[seed_host].seed_vm_vcpus }}"
+          volumes: "{{ hostvars[seed_host].seed_vm_volumes + [seed_vm_configdrive_volume] }}"
+          interfaces: >
+            {{ hostvars[seed_host].network_interfaces | map('net_libvirt_vm_network') | list }}
+          console_log_enabled: true
       become: True
 
   tasks:
diff --git a/requirements.yml b/requirements.yml
index 88ec47f67..54b01c243 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -21,9 +21,9 @@
 - src: stackhpc.grafana-conf
   version: 1.1.0
 - src: stackhpc.libvirt-host
-  version: v1.1.0
+  version: v1.3.0
 - src: stackhpc.libvirt-vm
-  version: v1.1.0
+  version: v1.6.0
 - src: stackhpc.mellanox-switch
   version: v1.0.0
 - src: stackhpc.os-images