Updated oslo.config to 1.11.0

This updates oslo.config to be in-line with global-requirements,
and renames all the old references of 'oslo.config' to the newer
oslo_config.

Change-Id: I68d8f67d37bca918ce1193c2a19e00f7ed4f6caa

requirements-py3.txt

@@ -5,7 +5,7 @@ alembic>=0.4.1
 Babel>=1.3
 iso8601>=0.1.9
 oauthlib>=0.6
-oslo.config>=1.9.3
+oslo.config>=1.11.0
 oslo.context>=0.2.0
 oslo.utils>=1.4.0
 pecan>=0.4.5

requirements.txt

@@ -5,7 +5,7 @@ alembic>=0.4.1
 Babel>=1.3
 iso8601>=0.1.9
 oauthlib>=0.6
-oslo.config>=1.9.3
+oslo.config>=1.11.0
 oslo.context>=0.2.0
 oslo.utils>=1.4.0
 pecan>=0.4.5

storyboard/api/app.py

@@ -15,7 +15,7 @@
 
 import os
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import _options
 from oslo_log import log
 import pecan

storyboard/api/app.wsgi

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 from storyboard.api import app
-from oslo.config import cfg
+from oslo_config import cfg
 
 CONF = cfg.CONF
 

storyboard/api/auth/__init__.py

@@ -12,7 +12,7 @@
 # implied. 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 storyboard.openstack.common.gettextutils import _  # noqa
 

storyboard/api/auth/oauth_validator.py

@@ -18,7 +18,7 @@ import pytz
 
 from oauthlib.oauth2 import RequestValidator
 from oauthlib.oauth2 import WebApplicationServer
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 
 from storyboard.db.api import access_tokens as token_api

storyboard/api/auth/openid_client.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
 import requests
 import six

storyboard/api/config.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
 
 app = {
     'root': 'storyboard.api.root_controller.RootController',

storyboard/api/v1/branches.py

@@ -16,7 +16,7 @@
 from datetime import datetime
 import pytz
 
-from oslo.config import cfg
+from oslo_config import cfg
 from pecan import abort
 from pecan import response
 from pecan import rest

storyboard/api/v1/milestones.py

@@ -16,7 +16,7 @@
 from datetime import datetime
 import pytz
 
-from oslo.config import cfg
+from oslo_config import cfg
 from pecan import abort
 from pecan import response
 from pecan import rest

storyboard/api/v1/project_groups.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 pecan import abort
 from pecan import response
 from pecan import rest

storyboard/api/v1/projects.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 pecan.decorators import expose
 from pecan import response
 from pecan import rest

storyboard/api/v1/search/search_engine.py

@@ -15,7 +15,7 @@
 
 import abc
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from storyboard.db import models
 

storyboard/api/v1/stories.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 pecan import abort
 from pecan import expose
 from pecan import request

storyboard/api/v1/subscription_events.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 
-from oslo.config import cfg
+from oslo_config import cfg
 from pecan import abort
 from pecan import request
 from pecan import response

storyboard/api/v1/subscriptions.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 pecan import abort
 from pecan import request
 from pecan import response

storyboard/api/v1/system_info.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 pbr.version import VersionInfo
 from pecan import rest
 from pecan.secure import secure

storyboard/api/v1/tags.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 pecan import request
 from pecan import rest
 from pecan.secure import secure

storyboard/api/v1/task_statuses.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 pecan import response
 from pecan import rest
 from pecan.secure import secure

storyboard/api/v1/tasks.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 pecan import abort
 from pecan import request
 from pecan import response

storyboard/api/v1/teams.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 pecan import abort
 from pecan.decorators import expose
 from pecan import response

storyboard/api/v1/timeline.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 pecan import abort
 from pecan import request
 from pecan import response

storyboard/api/v1/user_preferences.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
 from pecan import abort
 from pecan import request

storyboard/api/v1/user_tokens.py

@@ -15,7 +15,7 @@
 
 import uuid
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 from pecan import abort
 from pecan import request

storyboard/api/v1/users.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 pecan import abort
 from pecan import expose
 from pecan import request

storyboard/common/working_dir.py

@@ -17,7 +17,7 @@ import os
 
 import six
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 
 

storyboard/db/api/base.py

@@ -15,7 +15,7 @@
 
 import copy
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_db import exception as db_exc
 from oslo_db.sqlalchemy import session as db_session
 from oslo_db.sqlalchemy.utils import InvalidSortKey

storyboard/db/api/timeline_events.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import json
-from oslo.config import cfg
+from oslo_config import cfg
 from pecan import request
 from pecan import response
 from wsme.rest.json import tojson

storyboard/db/migration/cli.py

@@ -21,7 +21,7 @@ import os
 from alembic import command as alembic_command
 from alembic import config as alembic_config
 from alembic import util as alembic_util
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_db import options
 import six
 

storyboard/db/models.py

@@ -22,7 +22,7 @@ import pytz
 import six
 import six.moves.urllib.parse as urlparse
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_db.sqlalchemy import models
 from sqlalchemy import Boolean
 from sqlalchemy import Column

storyboard/db/projects_loader.py

@@ -16,7 +16,7 @@
 import warnings
 import yaml
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 import six
 from sqlalchemy.exc import SADeprecationWarning

storyboard/migrate/cli.py

@@ -12,7 +12,7 @@
 # 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
 
 from storyboard.db.api import base as db_api

storyboard/notifications/conf.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
 
 CONF = cfg.CONF
 

storyboard/notifications/connection_service.py

@@ -17,7 +17,7 @@ from threading import Timer
 
 import pika
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 
 from storyboard.openstack.common.gettextutils import _, _LI  # noqa

storyboard/notifications/publisher.py

@@ -15,7 +15,7 @@
 
 import json
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 from pika.exceptions import ConnectionClosed
 

storyboard/notifications/subscriber.py

@@ -16,7 +16,7 @@
 import json
 import time
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 from pika.exceptions import ConnectionClosed
 from stevedore import enabled

storyboard/openstack/common/fixture/config.py

@@ -16,7 +16,7 @@
 #    under the License.
 
 import fixtures
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 

storyboard/openstack/common/lockutils.py

@@ -26,7 +26,7 @@ import threading
 import time
 import weakref
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from storyboard.openstack.common import fileutils

storyboard/plugin/base.py

@@ -15,7 +15,7 @@
 import abc
 import six
 
-from oslo.config import cfg
+from oslo_config import cfg
 from stevedore.enabled import EnabledExtensionManager
 
 

storyboard/plugin/email/__init__.py

@@ -12,7 +12,7 @@
 # implied. 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
 
 from storyboard.common.working_dir import get_plugin_directory

storyboard/plugin/email/base.py

@@ -15,7 +15,7 @@
 
 import smtplib
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 
 from storyboard.plugin.base import PluginBase

storyboard/plugin/email/outbox.py

@@ -18,7 +18,7 @@ import six
 import time
 import uuid
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 
 from storyboard.plugin.email import get_email_directory

storyboard/plugin/email/smtp_client.py

@@ -14,7 +14,7 @@
 
 import smtplib
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 
 CONF = cfg.CONF

storyboard/plugin/event_worker.py

@@ -17,7 +17,7 @@ from multiprocessing import Process
 import signal
 from threading import Timer
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 
 import storyboard.db.api.base as db_api

storyboard/plugin/scheduler/__init__.py

@@ -15,7 +15,7 @@
 import atexit
 import six
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 from pytz import utc
 

storyboard/plugin/token_cleaner/__init__.py

@@ -12,7 +12,7 @@
 # implied. See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 CONF = cfg.CONF
 

storyboard/tests/api/auth/test_oauth.py

@@ -19,7 +19,7 @@ import requests
 import uuid
 
 from mock import patch
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 import six.moves.urllib.parse as urlparse
 

storyboard/tests/api/middleware/test_redirect_middleware.py

@@ -14,7 +14,7 @@
 
 import six
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from storyboard.tests import base
 

storyboard/tests/base.py

@@ -22,7 +22,7 @@ import uuid
 
 from alembic import command
 import fixtures
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 import pecan
 import pecan.testing

storyboard/tests/common/test_exception.py

@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from six.moves import http_client
 
 import storyboard.common.exception as exc

storyboard/tests/common/test_hook_priority.py

@@ -12,7 +12,7 @@
 # implied. 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 storyboard.common.hook_priorities as priority
 import storyboard.tests.base as base

storyboard/tests/common/test_working_dir.py

@@ -16,7 +16,7 @@ import os
 import shutil
 import stat
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 import storyboard.common.working_dir as working_dir
 import storyboard.tests.base as base

storyboard/tests/db/migration/test_migrations.py

@@ -37,7 +37,7 @@ postgres=# create database openstack_citest with owner openstack_citest;
 
 """
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_db.sqlalchemy import utils as db_utils
 
 from storyboard.tests.db.migration import test_migrations_base as base

storyboard/tests/db/migration/test_migrations_base.py

@@ -28,7 +28,7 @@ import os
 from alembic import command
 from alembic import config as alembic_config
 from alembic import migration
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 import six
 from six.moves import configparser
@@ -308,7 +308,7 @@ class BaseWalkMigrationTestCase(BaseMigrationTestCase):
         """For each type of repository we should do some of configure steps.
         For migrate_repo we should set under version control our database.
         For alembic we should configure database settings. For this goal we
-        should use oslo.config and openstack.commom.db.sqlalchemy.session with
+        should use oslo_config and openstack.commom.db.sqlalchemy.session with
         database functionality (reset default settings and session cleanup).
         """
         CONF.set_override('connection', six.text_type(engine.url),

storyboard/tests/plugin/email/test_base.py

@@ -17,7 +17,7 @@ import shutil
 import smtplib
 import stat
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 import mock_smtp as mock
 from storyboard.plugin.email.base import EmailPluginBase

storyboard/tests/plugin/email/test_init.py

@@ -15,7 +15,7 @@
 import os
 import stat
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from storyboard.plugin.email import get_email_directory
 from storyboard.tests import base

storyboard/tests/plugin/email/test_outbox.py

@@ -20,7 +20,7 @@ import re
 import six
 import uuid
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from storyboard.plugin.email.factory import EmailFactory
 from storyboard.plugin.email.outbox import get_outbox

storyboard/tests/plugin/email/test_smtp_client.py

@@ -12,7 +12,7 @@
 # implied. 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 mock_smtp as mock
 from storyboard.plugin.email.smtp_client import get_smtp_client

storyboard/tests/plugin/email/test_workers.py

@@ -17,7 +17,7 @@ from mock import patch
 from random import random
 import smtplib
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from storyboard.plugin.email.factory import EmailFactory
 from storyboard.plugin.email.outbox import Outbox

storyboard/tests/plugin/scheduler/mock_plugin.py

@@ -15,7 +15,7 @@
 import datetime
 
 from apscheduler.triggers.date import DateTrigger
-from oslo.config import cfg
+from oslo_config import cfg
 
 import storyboard.plugin.scheduler.base as plugin_base
 

storyboard/tests/plugin/scheduler/test_init.py

@@ -17,7 +17,7 @@ import datetime
 from apscheduler.triggers.date import DateTrigger
 
 from apscheduler.triggers.interval import IntervalTrigger
-from oslo.config import cfg
+from oslo_config import cfg
 from stevedore.extension import Extension
 
 from plugin.scheduler.mock_plugin import MockPlugin

storyboard/tests/plugin/token_cleaner/test_cleaner.py

@@ -16,7 +16,7 @@ from datetime import datetime
 from datetime import timedelta
 import pytz
 
-from oslo.config import cfg
+from oslo_config import cfg
 import storyboard.db.api.base as db_api
 from storyboard.db.models import AccessToken
 from storyboard.db.models import RefreshToken