Merge "Decode nova-manage args into unicode."

1 files changed, 4 insertions, 0 deletions

diff --git a/bin/nova-manage b/bin/nova-manage
index 61c5d4124..6289f1ba5 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -2373,6 +2373,10 @@ def main():
     for k, v in fn_kwargs.items():
         if v is None:
             del fn_kwargs[k]
+        else:
+            fn_kwargs[k] = v.decode('utf-8')
+
+    fn_args = [arg.decode('utf-8') for arg in fn_args]
 
     # call the action with the remaining arguments
     try: