From 3af163280c95426293bef9e1b843e18e679539ba Mon Sep 17 00:00:00 2001
From: Apollon Oikonomopoulos <apollon@noc.grnet.gr>
Date: Wed, 22 Jun 2011 18:41:29 +0300
Subject: [PATCH] KVM: fix per-instance stored UID value
When using the pool security model, _ExecuteKVMRuntime was storing the
instance's UID using str(uid), which would result in storing the
LockedUid.__repr__() result:
$ cat /var/run/ganeti/kvm-hypervisor/uid/xxxxxxxxxxxxx
<ganeti.uidpool.LockedUid object at 0x1f30610>
This patch restores the intended behaviour, by using LockedUid.AsStr().
Signed-off-by: Apollon Oikonomopoulos <apollon@noc.grnet.gr>
Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
lib/hypervisor/hv_kvm.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/hypervisor/hv_kvm.py b/lib/hypervisor/hv_kvm.py
index 290a2e866..6df67df81 100644
--- a/lib/hypervisor/hv_kvm.py
+++ b/lib/hypervisor/hv_kvm.py
@@ -875,7 +875,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
raise
else:
uid.Unlock()
- utils.WriteFile(self._InstanceUidFile(name), data=str(uid))
+ utils.WriteFile(self._InstanceUidFile(name), data=uid.AsStr())
else:
self._RunKVMCmd(name, kvm_cmd, tapfds)
--
GitLab