diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-22 06:22:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-22 06:22:39 +0000 |
| commit | cefb0510b8f12dab17126907661d82094c31741d (patch) | |
| tree | d65ab4d19e739b46d165fd0df799be320e547eab /nova/api | |
| parent | 76750f3dcce19098c9fb9793db1fe0c40411f7af (diff) | |
| parent | 967e9675874fc2a02a585cc6f9b99175f9cd656c (diff) | |
| download | nova-cefb0510b8f12dab17126907661d82094c31741d.tar.gz nova-cefb0510b8f12dab17126907661d82094c31741d.tar.xz nova-cefb0510b8f12dab17126907661d82094c31741d.zip | |
Merge "Fix sys_meta access in prep for instance object"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/metadata/password.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nova/api/metadata/password.py b/nova/api/metadata/password.py index 50f6c94ac..793dcc0a7 100644 --- a/nova/api/metadata/password.py +++ b/nova/api/metadata/password.py @@ -27,10 +27,10 @@ MAX_SIZE = CHUNKS * CHUNK_LENGTH def extract_password(instance): result = '' - for datum in sorted(instance.get('system_metadata', []), - key=lambda x: x['key']): - if datum['key'].startswith('password_'): - result += datum['value'] + sys_meta = utils.instance_sys_meta(instance) + for key in sorted(sys_meta.keys()): + if key.startswith('password_'): + result += sys_meta[key] return result or None |