diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-04-01 22:58:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-04-01 22:58:03 +0000 |
| commit | 6b5448bba94c12edef376ae7bab8296cd759ff89 (patch) | |
| tree | 76b53064743735f991e183932c10bfea108b1f2c | |
| parent | f51b4534f9152811a80d1430fab9ba7b53816a71 (diff) | |
| parent | 6ec0ac30c760328aa52474ad77d0ace40550e3d3 (diff) | |
| download | nova-6b5448bba94c12edef376ae7bab8296cd759ff89.tar.gz nova-6b5448bba94c12edef376ae7bab8296cd759ff89.tar.xz nova-6b5448bba94c12edef376ae7bab8296cd759ff89.zip | |
Merge "fixed postgresql flavor-create"
| -rw-r--r-- | Authors | 1 | ||||
| -rw-r--r-- | nova/compute/instance_types.py | 4 |
2 files changed, 4 insertions, 1 deletions
@@ -75,6 +75,7 @@ Hisaki Ohara <hisaki.ohara@intel.com> Ilya Alekseyev <ilyaalekseyev@acm.org> Isaku Yamahata <yamahata@valinux.co.jp> Ivan Kolodyazhny <e0ne@e0ne.info> +J. Daniel Schmidt <jdsn@suse.de> Jake Dahn <jake@ansolabs.com> James E. Blair <jeblair@hp.com> Jason Cannavale <jason.cannavale@rackspace.com> diff --git a/nova/compute/instance_types.py b/nova/compute/instance_types.py index fa001f2cd..2bc470a41 100644 --- a/nova/compute/instance_types.py +++ b/nova/compute/instance_types.py @@ -66,7 +66,9 @@ def create(name, memory, vcpus, root_gb, ephemeral_gb, flavorid, swap=None, raise exception.InvalidInput(reason=msg) kwargs['name'] = name - kwargs['flavorid'] = flavorid + # NOTE(vish): Internally, flavorid is stored as a string but it comes + # in through json as an integer, so we convert it here. + kwargs['flavorid'] = unicode(flavorid) try: return db.instance_type_create(context.get_admin_context(), kwargs) |