diff --git a/mistral/actions/openstack/action_generator/base.py b/mistral/actions/openstack/action_generator/base.py
index 5dfbe418..541ef75c 100644
--- a/mistral/actions/openstack/action_generator/base.py
+++ b/mistral/actions/openstack/action_generator/base.py
@@ -14,7 +14,7 @@
 
 import json
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 import pkg_resources as pkg
 
diff --git a/mistral/actions/openstack/actions.py b/mistral/actions/openstack/actions.py
index 7a8faf65..56b0836e 100644
--- a/mistral/actions/openstack/actions.py
+++ b/mistral/actions/openstack/actions.py
@@ -21,7 +21,7 @@ from keystoneclient import httpclient
 from keystoneclient.v3 import client as keystoneclient
 from neutronclient.v2_0 import client as neutronclient
 from novaclient.v2 import client as novaclient
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 
 from mistral.actions.openstack import base
diff --git a/mistral/api/access_control.py b/mistral/api/access_control.py
index c2cd3a7a..6a990cbc 100644
--- a/mistral/api/access_control.py
+++ b/mistral/api/access_control.py
@@ -17,7 +17,7 @@
 """Access Control API server."""
 
 from keystonemiddleware import auth_token
-from oslo.config import cfg
+from oslo_config import cfg
 
 
 _ENFORCER = None
diff --git a/mistral/api/app.py b/mistral/api/app.py
index 6991b101..bc88a3ca 100644
--- a/mistral/api/app.py
+++ b/mistral/api/app.py
@@ -14,7 +14,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 import pecan
 
 from mistral.api import access_control
diff --git a/mistral/cmd/launch.py b/mistral/cmd/launch.py
index ec26a4c4..65b9ecc9 100755
--- a/mistral/cmd/launch.py
+++ b/mistral/cmd/launch.py
@@ -34,9 +34,9 @@ POSSIBLE_TOPDIR = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'mistral', '__init__.py')):
     sys.path.insert(0, POSSIBLE_TOPDIR)
 
-from oslo.config import cfg
-from oslo import messaging
+from oslo_config import cfg
 from oslo_log import log as logging
+import oslo_messaging as messaging
 from wsgiref import simple_server
 
 from mistral.api import app
diff --git a/mistral/config.py b/mistral/config.py
index 8c60064d..d7d9e17a 100644
--- a/mistral/config.py
+++ b/mistral/config.py
@@ -20,7 +20,7 @@ Configuration options registration and useful routines.
 
 import itertools
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 
 from mistral import version
diff --git a/mistral/context.py b/mistral/context.py
index 7a68a026..e1d3317d 100644
--- a/mistral/context.py
+++ b/mistral/context.py
@@ -16,8 +16,8 @@
 
 import eventlet
 from keystoneclient.v3 import client as keystone_client
-from oslo.config import cfg
-from oslo import messaging
+from oslo_config import cfg
+import oslo_messaging as messaging
 from pecan import hooks
 
 from mistral import exceptions as exc
diff --git a/mistral/db/sqlalchemy/base.py b/mistral/db/sqlalchemy/base.py
index b2a94a5c..da91d8be 100644
--- a/mistral/db/sqlalchemy/base.py
+++ b/mistral/db/sqlalchemy/base.py
@@ -14,9 +14,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-from oslo.config import cfg
-from oslo.db import options
-from oslo.db.sqlalchemy import session as db_session
+from oslo_config import cfg
+from oslo_db import options
+from oslo_db.sqlalchemy import session as db_session
 from oslo_log import log as logging
 
 from mistral.db.sqlalchemy import sqlite_lock
diff --git a/mistral/db/sqlalchemy/migration/cli.py b/mistral/db/sqlalchemy/migration/cli.py
index 10c86a9d..25399b7c 100644
--- a/mistral/db/sqlalchemy/migration/cli.py
+++ b/mistral/db/sqlalchemy/migration/cli.py
@@ -18,7 +18,7 @@ import os
 from alembic import command as alembic_cmd
 from alembic import config as alembic_cfg
 from alembic import util as alembic_u
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from mistral.openstack.common import importutils
diff --git a/mistral/db/sqlalchemy/model_base.py b/mistral/db/sqlalchemy/model_base.py
index 8edd52e9..b0e49ab0 100644
--- a/mistral/db/sqlalchemy/model_base.py
+++ b/mistral/db/sqlalchemy/model_base.py
@@ -15,7 +15,7 @@
 #    limitations under the License.
 
 
-from oslo.db.sqlalchemy import models as oslo_models
+from oslo_db.sqlalchemy import models as oslo_models
 import sqlalchemy as sa
 from sqlalchemy import event
 from sqlalchemy.ext import declarative
diff --git a/mistral/db/v2/api.py b/mistral/db/v2/api.py
index dacc2df4..9baac3cb 100644
--- a/mistral/db/v2/api.py
+++ b/mistral/db/v2/api.py
@@ -15,7 +15,7 @@
 
 import contextlib
 
-from oslo.db import api as db_api
+from oslo_db import api as db_api
 from oslo_log import log as logging
 
 _BACKEND_MAPPING = {
diff --git a/mistral/db/v2/sqlalchemy/api.py b/mistral/db/v2/sqlalchemy/api.py
index 513d846d..f0e571f6 100644
--- a/mistral/db/v2/sqlalchemy/api.py
+++ b/mistral/db/v2/sqlalchemy/api.py
@@ -16,10 +16,10 @@
 import contextlib
 import sys
 
-from oslo.config import cfg
-from oslo.db import exception as db_exc
-from oslo.utils import timeutils
+from oslo_config import cfg
+from oslo_db import exception as db_exc
 from oslo_log import log as logging
+from oslo_utils import timeutils
 import sqlalchemy as sa
 
 from mistral.db.sqlalchemy import base as b
diff --git a/mistral/engine/rpc.py b/mistral/engine/rpc.py
index d6b738da..3575e233 100644
--- a/mistral/engine/rpc.py
+++ b/mistral/engine/rpc.py
@@ -13,10 +13,10 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-from oslo.config import cfg
-from oslo import messaging
-from oslo.messaging.rpc import client
+from oslo_config import cfg
 from oslo_log import log as logging
+import oslo_messaging as messaging
+from oslo_messaging.rpc import client
 
 from mistral import context as auth_ctx
 from mistral.engine import base
diff --git a/mistral/openstack/common/config/generator.py b/mistral/openstack/common/config/generator.py
index 3f641edf..32f6bdd3 100644
--- a/mistral/openstack/common/config/generator.py
+++ b/mistral/openstack/common/config/generator.py
@@ -27,7 +27,7 @@ import socket
 import sys
 import textwrap
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 import stevedore.named
 
diff --git a/mistral/openstack/common/lockutils.py b/mistral/openstack/common/lockutils.py
index fbae04c9..dacfc16d 100644
--- a/mistral/openstack/common/lockutils.py
+++ b/mistral/openstack/common/lockutils.py
@@ -27,7 +27,7 @@ import threading
 import time
 import weakref
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from mistral.openstack.common import fileutils
 from mistral.openstack.common.gettextutils import _, _LE, _LI
diff --git a/mistral/openstack/common/periodic_task.py b/mistral/openstack/common/periodic_task.py
index a3e9daa7..b4a72089 100644
--- a/mistral/openstack/common/periodic_task.py
+++ b/mistral/openstack/common/periodic_task.py
@@ -14,7 +14,7 @@
 import logging
 import time
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from mistral.openstack.common.gettextutils import _, _LE, _LI
diff --git a/mistral/services/security.py b/mistral/services/security.py
index 2f499b55..ad7de994 100644
--- a/mistral/services/security.py
+++ b/mistral/services/security.py
@@ -14,7 +14,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from mistral import context as auth_ctx
 from mistral.utils.openstack import keystone
diff --git a/mistral/tests/base.py b/mistral/tests/base.py
index b6b0cacc..b611c2c3 100644
--- a/mistral/tests/base.py
+++ b/mistral/tests/base.py
@@ -18,7 +18,7 @@ import pkg_resources as pkg
 import sys
 import time
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 from oslotest import base
 import testtools.matchers as ttm
diff --git a/mistral/tests/unit/api/base.py b/mistral/tests/unit/api/base.py
index 6a0c8b49..f3fa1898 100644
--- a/mistral/tests/unit/api/base.py
+++ b/mistral/tests/unit/api/base.py
@@ -15,7 +15,7 @@
 #    limitations under the License.
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 import pecan
 import pecan.testing
 from webtest import app as webtest_app
diff --git a/mistral/tests/unit/api/test_auth.py b/mistral/tests/unit/api/test_auth.py
index c4dc6523..ca85badf 100644
--- a/mistral/tests/unit/api/test_auth.py
+++ b/mistral/tests/unit/api/test_auth.py
@@ -15,7 +15,7 @@
 import datetime
 import uuid
 
-from oslo.config import cfg
+from oslo_config import cfg
 import pecan
 import pecan.testing
 
diff --git a/mistral/tests/unit/db/v2/test_locking.py b/mistral/tests/unit/db/v2/test_locking.py
index dfd2ed5e..e7a30fa1 100644
--- a/mistral/tests/unit/db/v2/test_locking.py
+++ b/mistral/tests/unit/db/v2/test_locking.py
@@ -15,7 +15,7 @@
 
 
 import eventlet
-from oslo.config import cfg
+from oslo_config import cfg
 import random
 
 from mistral.db.sqlalchemy import sqlite_lock
diff --git a/mistral/tests/unit/db/v2/test_sqlalchemy_db_api.py b/mistral/tests/unit/db/v2/test_sqlalchemy_db_api.py
index 7eb9809d..ebc5cff6 100644
--- a/mistral/tests/unit/db/v2/test_sqlalchemy_db_api.py
+++ b/mistral/tests/unit/db/v2/test_sqlalchemy_db_api.py
@@ -18,7 +18,7 @@
 import copy
 import datetime
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from mistral import context as auth_context
 from mistral.db.v2.sqlalchemy import api as db_api
diff --git a/mistral/tests/unit/db/v2/test_sqlite_transactions.py b/mistral/tests/unit/db/v2/test_sqlite_transactions.py
index af0431ff..7890b0cf 100644
--- a/mistral/tests/unit/db/v2/test_sqlite_transactions.py
+++ b/mistral/tests/unit/db/v2/test_sqlite_transactions.py
@@ -16,7 +16,7 @@
 
 import eventlet
 from eventlet import semaphore
-from oslo.config import cfg
+from oslo_config import cfg
 
 from mistral.db.v2.sqlalchemy import api as db_api
 from mistral.tests import base as test_base
diff --git a/mistral/tests/unit/engine/base.py b/mistral/tests/unit/engine/base.py
index 975ad4e1..72112cc8 100644
--- a/mistral/tests/unit/engine/base.py
+++ b/mistral/tests/unit/engine/base.py
@@ -13,9 +13,9 @@
 #    limitations under the License.
 
 import eventlet
-from oslo.config import cfg
-from oslo import messaging
+from oslo_config import cfg
 from oslo_log import log as logging
+import oslo_messaging as messaging
 
 from mistral import context as ctx
 from mistral.db.v2 import api as db_api
diff --git a/mistral/tests/unit/engine/test_action_context.py b/mistral/tests/unit/engine/test_action_context.py
index 907ab9db..f14daa40 100644
--- a/mistral/tests/unit/engine/test_action_context.py
+++ b/mistral/tests/unit/engine/test_action_context.py
@@ -15,7 +15,7 @@
 import json
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 import requests
 
diff --git a/mistral/tests/unit/engine/test_action_defaults.py b/mistral/tests/unit/engine/test_action_defaults.py
index 0f38a740..ca179e1b 100644
--- a/mistral/tests/unit/engine/test_action_defaults.py
+++ b/mistral/tests/unit/engine/test_action_defaults.py
@@ -15,7 +15,7 @@
 import json
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 import requests
 import testtools
diff --git a/mistral/tests/unit/engine/test_adhoc_actions.py b/mistral/tests/unit/engine/test_adhoc_actions.py
index d9887e2d..86c2160b 100644
--- a/mistral/tests/unit/engine/test_adhoc_actions.py
+++ b/mistral/tests/unit/engine/test_adhoc_actions.py
@@ -12,7 +12,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from mistral.db.v2 import api as db_api
diff --git a/mistral/tests/unit/engine/test_commands.py b/mistral/tests/unit/engine/test_commands.py
index 6dfd75ec..5a2fb48e 100644
--- a/mistral/tests/unit/engine/test_commands.py
+++ b/mistral/tests/unit/engine/test_commands.py
@@ -12,7 +12,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from mistral.db.v2 import api as db_api
diff --git a/mistral/tests/unit/engine/test_dataflow.py b/mistral/tests/unit/engine/test_dataflow.py
index 0e3d62cb..d1e00682 100644
--- a/mistral/tests/unit/engine/test_dataflow.py
+++ b/mistral/tests/unit/engine/test_dataflow.py
@@ -13,7 +13,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from mistral.db.v2 import api as db_api
diff --git a/mistral/tests/unit/engine/test_default_engine.py b/mistral/tests/unit/engine/test_default_engine.py
index 5096ef92..784d861c 100644
--- a/mistral/tests/unit/engine/test_default_engine.py
+++ b/mistral/tests/unit/engine/test_default_engine.py
@@ -17,7 +17,7 @@ import datetime
 import uuid
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_messaging.rpc import client as rpc_client
 
diff --git a/mistral/tests/unit/engine/test_direct_workflow.py b/mistral/tests/unit/engine/test_direct_workflow.py
index 02224acf..aa44d365 100644
--- a/mistral/tests/unit/engine/test_direct_workflow.py
+++ b/mistral/tests/unit/engine/test_direct_workflow.py
@@ -13,7 +13,7 @@
 #    limitations under the License.
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from mistral.db.v2 import api as db_api
diff --git a/mistral/tests/unit/engine/test_environment.py b/mistral/tests/unit/engine/test_environment.py
index 574dfc80..a8533373 100644
--- a/mistral/tests/unit/engine/test_environment.py
+++ b/mistral/tests/unit/engine/test_environment.py
@@ -13,7 +13,7 @@
 #    limitations under the License.
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from mistral.db.v2 import api as db_api
diff --git a/mistral/tests/unit/engine/test_javascript_action.py b/mistral/tests/unit/engine/test_javascript_action.py
index cdaf36b3..2878429d 100644
--- a/mistral/tests/unit/engine/test_javascript_action.py
+++ b/mistral/tests/unit/engine/test_javascript_action.py
@@ -13,7 +13,7 @@
 #    limitations under the License.
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 import testtools
 
diff --git a/mistral/tests/unit/engine/test_join.py b/mistral/tests/unit/engine/test_join.py
index 27833de9..2d6ae225 100644
--- a/mistral/tests/unit/engine/test_join.py
+++ b/mistral/tests/unit/engine/test_join.py
@@ -12,7 +12,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 import testtools
 
diff --git a/mistral/tests/unit/engine/test_noop_task.py b/mistral/tests/unit/engine/test_noop_task.py
index f296fbd0..4d50f88b 100644
--- a/mistral/tests/unit/engine/test_noop_task.py
+++ b/mistral/tests/unit/engine/test_noop_task.py
@@ -12,7 +12,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from mistral.db.v2 import api as db_api
diff --git a/mistral/tests/unit/engine/test_policies.py b/mistral/tests/unit/engine/test_policies.py
index aa490d06..025d3065 100644
--- a/mistral/tests/unit/engine/test_policies.py
+++ b/mistral/tests/unit/engine/test_policies.py
@@ -13,7 +13,7 @@
 #    limitations under the License.
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from mistral.actions import std_actions
diff --git a/mistral/tests/unit/engine/test_race_condition.py b/mistral/tests/unit/engine/test_race_condition.py
index f2d3235d..76f143f1 100644
--- a/mistral/tests/unit/engine/test_race_condition.py
+++ b/mistral/tests/unit/engine/test_race_condition.py
@@ -14,7 +14,7 @@
 
 from eventlet import corolocal
 from eventlet import semaphore
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from mistral.actions import base as action_base
diff --git a/mistral/tests/unit/engine/test_reverse_workflow.py b/mistral/tests/unit/engine/test_reverse_workflow.py
index b387aad7..29712957 100644
--- a/mistral/tests/unit/engine/test_reverse_workflow.py
+++ b/mistral/tests/unit/engine/test_reverse_workflow.py
@@ -12,7 +12,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from mistral.db.v2 import api as db_api
diff --git a/mistral/tests/unit/engine/test_subworkflows.py b/mistral/tests/unit/engine/test_subworkflows.py
index 5393b6dc..8ecadfb4 100644
--- a/mistral/tests/unit/engine/test_subworkflows.py
+++ b/mistral/tests/unit/engine/test_subworkflows.py
@@ -14,7 +14,7 @@
 #    limitations under the License.
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from mistral.actions import std_actions
diff --git a/mistral/tests/unit/engine/test_task_defaults.py b/mistral/tests/unit/engine/test_task_defaults.py
index ed2aedb6..1f0e9c80 100644
--- a/mistral/tests/unit/engine/test_task_defaults.py
+++ b/mistral/tests/unit/engine/test_task_defaults.py
@@ -13,7 +13,7 @@
 #    limitations under the License.
 
 import datetime as dt
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 import testtools
 
diff --git a/mistral/tests/unit/engine/test_with_items.py b/mistral/tests/unit/engine/test_with_items.py
index e01a4e23..6393c4ca 100644
--- a/mistral/tests/unit/engine/test_with_items.py
+++ b/mistral/tests/unit/engine/test_with_items.py
@@ -13,7 +13,7 @@
 #    limitations under the License.
 
 import copy
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from mistral.actions import base as action_base
diff --git a/mistral/tests/unit/engine/test_workflow_resume.py b/mistral/tests/unit/engine/test_workflow_resume.py
index fc5db079..b9d70923 100644
--- a/mistral/tests/unit/engine/test_workflow_resume.py
+++ b/mistral/tests/unit/engine/test_workflow_resume.py
@@ -13,7 +13,7 @@
 #    limitations under the License.
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from mistral.db.v2 import api as db_api
 from mistral.engine import default_engine as de
diff --git a/mistral/tests/unit/services/test_action_service.py b/mistral/tests/unit/services/test_action_service.py
index 1b69200d..ee61df79 100644
--- a/mistral/tests/unit/services/test_action_service.py
+++ b/mistral/tests/unit/services/test_action_service.py
@@ -12,7 +12,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from mistral.db.v2 import api as db_api
diff --git a/mistral/tests/unit/services/test_trigger_service.py b/mistral/tests/unit/services/test_trigger_service.py
index 4d88ec34..ba0a446c 100644
--- a/mistral/tests/unit/services/test_trigger_service.py
+++ b/mistral/tests/unit/services/test_trigger_service.py
@@ -14,7 +14,7 @@
 
 import datetime
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from mistral import exceptions as exc
 from mistral.services import security
diff --git a/mistral/tests/unit/services/test_workbook_service.py b/mistral/tests/unit/services/test_workbook_service.py
index 364474be..b3af66ff 100644
--- a/mistral/tests/unit/services/test_workbook_service.py
+++ b/mistral/tests/unit/services/test_workbook_service.py
@@ -12,7 +12,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from mistral.db.v2 import api as db_api
diff --git a/mistral/tests/unit/services/test_workflow_service.py b/mistral/tests/unit/services/test_workflow_service.py
index b9ac5dad..469ba7ca 100644
--- a/mistral/tests/unit/services/test_workflow_service.py
+++ b/mistral/tests/unit/services/test_workflow_service.py
@@ -12,7 +12,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from mistral import exceptions as exc
diff --git a/mistral/utils/openstack/keystone.py b/mistral/utils/openstack/keystone.py
index 1c5b1f80..c64d48e6 100644
--- a/mistral/utils/openstack/keystone.py
+++ b/mistral/utils/openstack/keystone.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 from keystoneclient.v3 import client as ks_client
-from oslo.config import cfg
+from oslo_config import cfg
 
 from mistral import context
 
diff --git a/mistral/utils/wf_trace.py b/mistral/utils/wf_trace.py
index c2ae2b56..29274348 100644
--- a/mistral/utils/wf_trace.py
+++ b/mistral/utils/wf_trace.py
@@ -13,7 +13,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from mistral.db.v2.sqlalchemy import models
diff --git a/mistral/workflow/data_flow.py b/mistral/workflow/data_flow.py
index a1b68178..e7bc13dc 100644
--- a/mistral/workflow/data_flow.py
+++ b/mistral/workflow/data_flow.py
@@ -15,7 +15,7 @@
 
 import copy
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from mistral import context as auth_ctx