summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Fenzi <kevin@scrye.com>2019-11-14 16:57:33 +0000
committerKevin Fenzi <kevin@scrye.com>2019-11-14 16:57:56 +0000
commitf2591ca94c98799ce7b52328172dac8c150ca261 (patch)
treed061d9f57994e8b10a0bfd6fb0d522519c3bfd1e
parent71f70253c220eee374a132538e92e6d0fa826acf (diff)
downloadansible-f2591ca94c98799ce7b52328172dac8c150ca261.zip
ansible-f2591ca94c98799ce7b52328172dac8c150ca261.tar.gz
ansible-f2591ca94c98799ce7b52328172dac8c150ca261.tar.xz
armv7 create: move back to python2 and hope it works again.
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
-rwxr-xr-xlibrary/virt_boot2
-rw-r--r--tasks/virt_instance_create.yml4
2 files changed, 3 insertions, 3 deletions
diff --git a/library/virt_boot b/library/virt_boot
index 6280297..e066c49 100755
--- a/library/virt_boot
+++ b/library/virt_boot
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python
# -*- coding: utf-8 -*-
# (c) 2012, Jeroen Hoekx <jeroen@hoekx.be>
diff --git a/tasks/virt_instance_create.yml b/tasks/virt_instance_create.yml
index c65bede..b5a1ae3 100644
--- a/tasks/virt_instance_create.yml
+++ b/tasks/virt_instance_create.yml
@@ -65,8 +65,8 @@
- armv7-kernel
- name: ARMv7 update the virt parameters
- vars:
- ansible_python_interpreter: /usr/bin/python3
+# vars:
+# ansible_python_interpreter: /usr/bin/python3
virt_boot: domain={{ inventory_hostname }} kernel=/var/lib/libvirt/images/{{ host_armv7kernel.stdout }} initrd=/var/lib/libvirt/images/{{ host_armv7initrd.stdout }} cmdline={{ host_cmdline.stdout }}
delegate_to: "{{ vmhost }}"
when: inventory_hostname.startswith('buildvm-armv7') and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined )