diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-07 19:33:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-07 19:33:24 +0000 |
| commit | 363e7aa554cb435ad12aa9182a78adb26a9cd2c7 (patch) | |
| tree | 951db2ca9cd89c5bb1e05ba479b4cc2296be3fee /nova/compute | |
| parent | 6fb8b47d48d36c5ed3be899fb08536fc29dc9344 (diff) | |
| parent | 77c30189abe53326d99241a465b702ad7eed6b03 (diff) | |
Merge "Fix inject_files for storing binary file."
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 605ebab6c..60d72e565 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -27,6 +27,7 @@ terminating it. """ +import base64 import contextlib import functools import socket @@ -1069,6 +1070,9 @@ class ComputeManager(manager.SchedulerDependentManager): filter_properties = {} if injected_files is None: injected_files = [] + else: + injected_files = [(path, base64.b64decode(contents)) + for path, contents in injected_files] @lockutils.synchronized(instance['uuid'], 'nova-') def do_run_instance(): |