[PATCH stable-2.12 1/2] Put private parameters into the environment

['Lisa Velden' via ganeti-devel]

and unobscure them

Signed-off-by: Lisa Velden <vel...@google.com>
---
 lib/backend.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/backend.py b/lib/backend.py
index b9eaa63..6a495ac 100644
--- a/lib/backend.py
+++ b/lib/backend.py
@@ -3234,7 +3234,8 @@ def OSEnvironment(instance, inst_os, debug=0):
       cannot be found
 
   """
-  result = OSCoreEnv(instance.os, inst_os, instance.osparams, debug=debug)
+  result = OSCoreEnv(instance.os, inst_os, objects.FillDict(instance.osparams,
+                     instance.osparams_private.Unprivate()), debug=debug)
 
   for attr in ["name", "os", "uuid", "ctime", "mtime", "primary_node"]:
     result["INSTANCE_%s" % attr.upper()] = str(getattr(instance, attr))
-- 
2.2.0.rc0.207.ga3a616c