From: Iustin Pop <iustin@google.com>
Date: Mon, 25 May 2009 09:57:50 +0000 (+0200)
Subject: Fix backend.OSEnvironment be/hv parameters
X-Git-Tag: v2.0.1~6^2~3
X-Git-Url: https://code.grnet.gr/git/ganeti-local/commitdiff_plain/030b218a9ec22ed6bf18f0513e35115e940ffaa4

Fix backend.OSEnvironment be/hv parameters

Commit 67fc3042c20f5893abf71a0b4c445c356f9603b9 added some more
variables to be exported to OSEnvironment, but it has two bugs:
  - wrong variable name (env vs. result)
  - in OSEnvironment we don't have the automatic converstion to strings
    that we do in hooks, so we must manually enforce this

With this patch instance creations work again.

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---

diff --git a/lib/backend.py b/lib/backend.py
index 3cdea3e..54dc023 100644
--- a/lib/backend.py
+++ b/lib/backend.py
@@ -1692,7 +1692,7 @@ def OSEnvironment(instance, debug=0):
 
   for source, kind in [(instance.beparams, "BE"), (instance.hvparams, "HV")]:
     for key, value in source.items():
-      env["INSTANCE_%s_%s" % (kind, key)] = value
+      result["INSTANCE_%s_%s" % (kind, key)] = str(value)
 
   return result