By passing a dict instead of a single value, we force SDK to populate
the correct attribute on the object.
Also fixed conflicts in openstackclient/compute/v2/server.py added by
ece30e8f70
Change-Id: I9f4c5964dc0546215474c92db567966ffad68a1a
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Related-bug: #2089821
(cherry picked from commit 22b30b99ce)