diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-19 20:23:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-19 20:23:20 +0000 |
| commit | a6008026acde19cec18bca4d79b57eba2ade290b (patch) | |
| tree | 3d68a0fa53c8363e75b1af0c51d1ac6479059c3a /nova/db | |
| parent | 59933249054bf71ec963585198583fe78050c9d6 (diff) | |
| parent | d527eda20b030c99239477af51a73537c3c781d4 (diff) | |
| download | nova-a6008026acde19cec18bca4d79b57eba2ade290b.tar.gz nova-a6008026acde19cec18bca4d79b57eba2ade290b.tar.xz nova-a6008026acde19cec18bca4d79b57eba2ade290b.zip | |
Merge "Assign unique names with os-multiple-create."
Diffstat (limited to 'nova/db')
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 03373764f..40d0c2334 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1841,8 +1841,9 @@ def _instance_update(context, instance_uuid, values, copy_old_instance=False): raise exception.UnexpectedTaskStateError(actual=actual_state, expected=expected) + instance_hostname = instance_ref['hostname'] or '' if ("hostname" in values and - values["hostname"].lower() != instance_ref["hostname"].lower()): + values["hostname"].lower() != instance_hostname.lower()): _validate_unique_server_name(context, session, values['hostname']) |