diff options
| author | Josh Kearney <josh.kearney@rackspace.com> | 2011-01-19 14:57:42 -0600 |
|---|---|---|
| committer | Josh Kearney <josh.kearney@rackspace.com> | 2011-01-19 14:57:42 -0600 |
| commit | e8748afd0773e2599aaa9898d6fe4ef850d6fe5a (patch) | |
| tree | 02ae4007143cd5029d7f8285ed00e02fa6ad19d5 | |
| parent | 76e88b6c1139640fede5150b58d2e3427a582a8a (diff) | |
| parent | ff9ec3576c4efb24baa657405591ead991ea1287 (diff) | |
| download | nova-e8748afd0773e2599aaa9898d6fe4ef850d6fe5a.tar.gz nova-e8748afd0773e2599aaa9898d6fe4ef850d6fe5a.tar.xz nova-e8748afd0773e2599aaa9898d6fe4ef850d6fe5a.zip | |
Merged trunk
| -rwxr-xr-x | contrib/nova.sh | 1 | ||||
| -rw-r--r-- | nova/api/direct.py | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/contrib/nova.sh b/contrib/nova.sh index a0e8e642c..08dc89bae 100755 --- a/contrib/nova.sh +++ b/contrib/nova.sh @@ -87,6 +87,7 @@ if [ "$CMD" == "install" ]; then sudo apt-get install -y python-twisted python-sqlalchemy python-mox python-greenlet python-carrot sudo apt-get install -y python-daemon python-eventlet python-gflags python-ipy sudo apt-get install -y python-libvirt python-libxml2 python-routes python-cheetah + sudo apt-get install -y python-paste python-pastedeploy #For IPV6 sudo apt-get install -y python-netaddr sudo apt-get install -y radvd diff --git a/nova/api/direct.py b/nova/api/direct.py index 81b3ae202..509ab3ae0 100644 --- a/nova/api/direct.py +++ b/nova/api/direct.py @@ -196,6 +196,8 @@ class ServiceWrapper(wsgi.Controller): # TODO(termie): do some basic normalization on methods method = getattr(self.service_handle, action) + # NOTE(vish): make sure we have no unicode keys for py2.6. + params = dict([(str(k), v) for (k, v) in params.iteritems()]) result = method(context, **params) if type(result) is dict or type(result) is list: return self._serialize(result, req) |