diff options
| author | Joel Martin <github@martintribe.org> | 2013-04-08 10:32:03 -0700 |
|---|---|---|
| committer | Joel Martin <github@martintribe.org> | 2013-04-08 10:32:03 -0700 |
| commit | cededc4d14242df198dae0434d9c87a3d89c8020 (patch) | |
| tree | 04e3e5a3b41c1431d2038fb167a414fdd1f1da4f | |
| parent | 60d991774b8099c640b71b9735367771f3b4234e (diff) | |
| parent | de0f8773b15dfa20c0fd631580ce0df475bd6247 (diff) | |
| download | novnc-cededc4d14242df198dae0434d9c87a3d89c8020.tar.gz | |
Merge pull request #244 from djipko/common_conf_to_oslo_conf
Import cfg from oslo in nova-novncproxy
| -rwxr-xr-x | utils/nova-novncproxy | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/nova-novncproxy b/utils/nova-novncproxy index c3afe44..a1a6947 100755 --- a/utils/nova-novncproxy +++ b/utils/nova-novncproxy @@ -23,6 +23,7 @@ Leverages wsproxy.py by Joel Martin ''' import Cookie +from oslo.config import cfg import socket import sys @@ -31,7 +32,6 @@ import wsproxy from nova import config from nova import context from nova import utils -from nova.openstack.common import cfg from nova.openstack.common import rpc |