diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-20 21:08:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-20 21:08:59 +0000 |
| commit | 6eae59d60a8021c8df616f65c1237018ff59d4ad (patch) | |
| tree | 48197a51adc860109893440eac00c39ca33c63b0 /nova | |
| parent | acb1f3fe327cb37606e274e1afaab5020628b73c (diff) | |
| parent | bb94747da49ba35aca8a4a431e89c26c60d41cd9 (diff) | |
| download | nova-6eae59d60a8021c8df616f65c1237018ff59d4ad.tar.gz nova-6eae59d60a8021c8df616f65c1237018ff59d4ad.tar.xz nova-6eae59d60a8021c8df616f65c1237018ff59d4ad.zip | |
Merge "Add key_name attribute in XML servers API"
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/api/openstack/compute/servers.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index 0c5a2e530..a7baf62d7 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -158,7 +158,7 @@ class CommonDeserializer(wsgi.MetadataXMLDeserializer): server_node = self.find_first_child_named(node, 'server') attributes = ["name", "imageRef", "flavorRef", "adminPass", - "accessIPv4", "accessIPv6"] + "accessIPv4", "accessIPv6", "key_name"] for attr in attributes: if server_node.getAttribute(attr): server[attr] = server_node.getAttribute(attr) |