From 996bb410fbf1f453fb514f45419c2231f39cd100 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Mon, 9 Jul 2018 12:02:55 +0200 Subject: [PATCH] Taskotron: Remove custom domain-template.jinja Use the file distributed by upstream testcloud --- .../files/domain-template.jinja | 59 ------------------- .../taskotron/taskotron-client/tasks/main.yml | 4 -- 2 files changed, 63 deletions(-) delete mode 100644 roles/taskotron/taskotron-client/files/domain-template.jinja diff --git a/roles/taskotron/taskotron-client/files/domain-template.jinja b/roles/taskotron/taskotron-client/files/domain-template.jinja deleted file mode 100644 index 87f8860ea2..0000000000 --- a/roles/taskotron/taskotron-client/files/domain-template.jinja +++ /dev/null @@ -1,59 +0,0 @@ - - {{ domain_name }} - {{ uuid }} - {{ memory }} - {{ memory }} - 1 - - hvm - - - - - - - - - destroy - restart - restart - - - - - - /usr/bin/qemu-kvm - - - - -
- - - - - -
- - - - - -
- - - - - - - - - -
- - - /dev/random - - - - diff --git a/roles/taskotron/taskotron-client/tasks/main.yml b/roles/taskotron/taskotron-client/tasks/main.yml index d0e12a161c..2c90225317 100644 --- a/roles/taskotron/taskotron-client/tasks/main.yml +++ b/roles/taskotron/taskotron-client/tasks/main.yml @@ -131,7 +131,3 @@ - name: setup nested virt on virthosts with nested=true variable copy: src=kvm_intel.conf dest=/etc/modprobe.d/kvm_intel.conf when: nested == true - -- name: copy domain xml for testcloud that allows nested virt - copy: src=domain-template.jinja dest=/var/lib/testcloud/domain-template.jinja owner=qemu group=testcloud mode=0764 - when: deployment_type in ['dev', 'stg', 'prod']