diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-09-06 12:48:41 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-09-06 12:48:41 -0700 |
| commit | 1f3856ffb92ab690b1d630deb6fa025ae74348f7 (patch) | |
| tree | d956fa6af0e40673edc63de42e33ec8b7777f7ba | |
| parent | f23c0569e72e875de3c51fb9d65606c400f0dc1c (diff) | |
revert changes to display description
| -rw-r--r-- | nova/api/openstack/create_instance_helper.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/nova/api/openstack/create_instance_helper.py b/nova/api/openstack/create_instance_helper.py index 9b2928bc8..29e071609 100644 --- a/nova/api/openstack/create_instance_helper.py +++ b/nova/api/openstack/create_instance_helper.py @@ -161,10 +161,6 @@ class CreateInstanceHelper(object): 'config_drive': config_drive, 'password': password} - # NOTE(vish): This is solely for compatibility with anything - # that is using the display description field. - metadata = server_dict.get('metadata') or {} - display_description = metadata.get('description') or name return (extra_values, create_method(context, inst_type, @@ -172,9 +168,9 @@ class CreateInstanceHelper(object): kernel_id=kernel_id, ramdisk_id=ramdisk_id, display_name=name, - display_description=display_description, + display_description=name, key_name=key_name, - metadata=metadata, + metadata=server_dict.get('metadata', {}), access_ip_v4=server_dict.get('accessIPv4'), access_ip_v6=server_dict.get('accessIPv6'), injected_files=injected_files, |