summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYAMAMOTO Takashi <yamamoto@valinux.co.jp>2013-02-20 12:38:44 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2013-02-24 13:07:59 +0900
commit0af7056b7d54cdd6c8e565653f0b84137c4d4d33 (patch)
treef7dc37b7dbcbf24049731ddfa84db5b874660af5
parent998feb1b4082c367a4f46d10c0e723e402c623de (diff)
switch from openstack.common.cfg to oslo.config.cfg
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rwxr-xr-xbin/ryu-manager4
-rw-r--r--ryu/app/quantum_adapter.py2
-rw-r--r--ryu/app/tunnel_port_updater.py2
-rw-r--r--ryu/app/wsgi.py2
-rw-r--r--ryu/controller/controller.py2
-rw-r--r--ryu/flags.py2
-rw-r--r--ryu/lib/ovs/bridge.py2
-rw-r--r--ryu/log.py2
8 files changed, 9 insertions, 9 deletions
diff --git a/bin/ryu-manager b/bin/ryu-manager
index 1e8d3aa6..454c7f45 100755
--- a/bin/ryu-manager
+++ b/bin/ryu-manager
@@ -26,10 +26,10 @@ monkey.patch_all()
# use it
#
# NOTE: this modifies sys.path and thus affects the following imports.
-# eg. openstack.common.cfg.
+# eg. oslo.config.cfg.
import ryu.contrib
-from openstack.common import cfg
+from oslo.config import cfg
import logging
import sys
diff --git a/ryu/app/quantum_adapter.py b/ryu/app/quantum_adapter.py
index 8fc23396..2113d7e7 100644
--- a/ryu/app/quantum_adapter.py
+++ b/ryu/app/quantum_adapter.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from openstack.common import cfg
+from oslo.config import cfg
import logging
from quantumclient import client as q_client
diff --git a/ryu/app/tunnel_port_updater.py b/ryu/app/tunnel_port_updater.py
index 915794d2..7d02a8a3 100644
--- a/ryu/app/tunnel_port_updater.py
+++ b/ryu/app/tunnel_port_updater.py
@@ -16,7 +16,7 @@
import collections
import gevent
-from openstack.common import cfg
+from oslo.config import cfg
import logging
import netaddr
diff --git a/ryu/app/wsgi.py b/ryu/app/wsgi.py
index 138563b8..16ed3ebf 100644
--- a/ryu/app/wsgi.py
+++ b/ryu/app/wsgi.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from openstack.common import cfg
+from oslo.config import cfg
import logging
import webob.dec
diff --git a/ryu/controller/controller.py b/ryu/controller/controller.py
index 841b388c..e66f11bc 100644
--- a/ryu/controller/controller.py
+++ b/ryu/controller/controller.py
@@ -15,7 +15,7 @@
# limitations under the License.
import contextlib
-from openstack.common import cfg
+from oslo.config import cfg
import logging
import gevent
import traceback
diff --git a/ryu/flags.py b/ryu/flags.py
index 1275530c..b09e4d88 100644
--- a/ryu/flags.py
+++ b/ryu/flags.py
@@ -17,7 +17,7 @@
global flags
"""
-from openstack.common import cfg
+from oslo.config import cfg
CONF = cfg.CONF
diff --git a/ryu/lib/ovs/bridge.py b/ryu/lib/ovs/bridge.py
index b68b50b3..af3def1e 100644
--- a/ryu/lib/ovs/bridge.py
+++ b/ryu/lib/ovs/bridge.py
@@ -19,7 +19,7 @@ slimmed down version of OVSBridge in quantum agent
"""
import functools
-from openstack.common import cfg
+from oslo.config import cfg
import logging
import ryu.exception as ryu_exc
diff --git a/ryu/log.py b/ryu/log.py
index 0efaeff0..7d673ca4 100644
--- a/ryu/log.py
+++ b/ryu/log.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from openstack.common import cfg
+from oslo.config import cfg
import inspect
import logging
import logging.handlers