summaryrefslogtreecommitdiff
path: root/devstack
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-01-07 16:09:02 +0000
committerGerrit Code Review <review@openstack.org>2020-01-07 16:09:02 +0000
commit38d852d6f4def8ffa4a274f1366134a83bf833ce (patch)
tree59a5cd464ac1b92f654b494b8e29b66a2c052dba /devstack
parent7783981e2b180cbc551b0bb19dffab959d11b203 (diff)
parent373f428fc2c6e258baa3ba7078ead96fde305d8c (diff)
downloadironic-38d852d6f4def8ffa4a274f1366134a83bf833ce.tar.gz
Merge "Make qemu hook running with python3"
Diffstat (limited to 'devstack')
-rwxr-xr-xdevstack/files/hooks/qemu.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/devstack/files/hooks/qemu.py b/devstack/files/hooks/qemu.py
index 872d5e101..75ecba9c7 100755
--- a/devstack/files/hooks/qemu.py
+++ b/devstack/files/hooks/qemu.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -tt
+#!/usr/bin/python3
# Copyright (c) 2017 Intel Corporation
#
@@ -45,10 +45,9 @@ def main():
action = sys.argv[2]
if action == "started":
- interfaces = str(
- subprocess.check_output(
- ['ip', 'link', 'show', 'type', 'macvtap']
- )).split("\n")
+ interfaces = subprocess.check_output(
+ ['ip', 'link', 'show', 'type', 'macvtap']
+ ).decode().split("\n")
for iface_line in interfaces:
if 'macvtap' in iface_line:
iface_string = iface_line.split('@')