Merge pull request #244 from djipko/common_conf_to_oslo_conf
Import cfg from oslo in nova-novncproxy
This commit is contained in:
commit
cededc4d14
|
@ -23,6 +23,7 @@ Leverages wsproxy.py by Joel Martin
|
||||||
'''
|
'''
|
||||||
|
|
||||||
import Cookie
|
import Cookie
|
||||||
|
from oslo.config import cfg
|
||||||
import socket
|
import socket
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
@ -31,7 +32,6 @@ import wsproxy
|
||||||
from nova import config
|
from nova import config
|
||||||
from nova import context
|
from nova import context
|
||||||
from nova import utils
|
from nova import utils
|
||||||
from nova.openstack.common import cfg
|
|
||||||
from nova.openstack.common import rpc
|
from nova.openstack.common import rpc
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue