Merge "Delete the unused LOG configure code"
This commit is contained in:
@@ -13,7 +13,6 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
|
||||||
from oslo_middleware import request_id as oslo_request_id
|
from oslo_middleware import request_id as oslo_request_id
|
||||||
|
|
||||||
from murano.common.i18n import _
|
from murano.common.i18n import _
|
||||||
@@ -27,7 +26,6 @@ context_opts = [
|
|||||||
|
|
||||||
CONF = cfg.CONF
|
CONF = cfg.CONF
|
||||||
CONF.register_opts(context_opts)
|
CONF.register_opts(context_opts)
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
CONF = cfg.CONF
|
CONF = cfg.CONF
|
||||||
|
|
||||||
|
|
||||||
|
@@ -14,9 +14,7 @@
|
|||||||
|
|
||||||
from keystoneclient.v3 import client
|
from keystoneclient.v3 import client
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
CONF = cfg.CONF
|
CONF = cfg.CONF
|
||||||
|
|
||||||
|
|
||||||
|
@@ -19,12 +19,10 @@ from oslo_config import cfg
|
|||||||
from oslo_db import exception
|
from oslo_db import exception
|
||||||
from oslo_db import options
|
from oslo_db import options
|
||||||
from oslo_db.sqlalchemy import session as db_session
|
from oslo_db.sqlalchemy import session as db_session
|
||||||
from oslo_log import log as logging
|
|
||||||
from oslo_utils import timeutils
|
from oslo_utils import timeutils
|
||||||
|
|
||||||
from murano.db.models import Lock
|
from murano.db.models import Lock
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
CONF = cfg.CONF
|
CONF = cfg.CONF
|
||||||
|
|
||||||
options.set_defaults(CONF)
|
options.set_defaults(CONF)
|
||||||
|
@@ -17,13 +17,11 @@ import json
|
|||||||
import os
|
import os
|
||||||
|
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
|
||||||
import yaml
|
import yaml
|
||||||
|
|
||||||
from murano.dsl import murano_package
|
from murano.dsl import murano_package
|
||||||
|
|
||||||
CONF = cfg.CONF
|
CONF = cfg.CONF
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class MuranoPackage(murano_package.MuranoPackage):
|
class MuranoPackage(murano_package.MuranoPackage):
|
||||||
|
@@ -14,14 +14,12 @@
|
|||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
|
||||||
import oslo_messaging as messaging
|
import oslo_messaging as messaging
|
||||||
|
|
||||||
from murano.common import uuidutils
|
from murano.common import uuidutils
|
||||||
from murano.dsl import dsl
|
from murano.dsl import dsl
|
||||||
|
|
||||||
CONF = cfg.CONF
|
CONF = cfg.CONF
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
UNCLASSIFIED = 0
|
UNCLASSIFIED = 0
|
||||||
APPLICATION = 100
|
APPLICATION = 100
|
||||||
|
@@ -21,7 +21,6 @@ from yaql.language import yaqltypes
|
|||||||
|
|
||||||
from murano.dsl import dsl
|
from murano.dsl import dsl
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
NAME_TEMPLATE = 'applications.{0}'
|
NAME_TEMPLATE = 'applications.{0}'
|
||||||
|
|
||||||
inject_format = specs.inject(
|
inject_format = specs.inject(
|
||||||
|
@@ -17,13 +17,10 @@
|
|||||||
import json
|
import json
|
||||||
|
|
||||||
import eventlet
|
import eventlet
|
||||||
from oslo_log import log as logging
|
|
||||||
|
|
||||||
from murano.dsl import dsl
|
from murano.dsl import dsl
|
||||||
from murano.dsl import helpers
|
from murano.dsl import helpers
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class MistralError(Exception):
|
class MistralError(Exception):
|
||||||
pass
|
pass
|
||||||
|
@@ -16,14 +16,12 @@
|
|||||||
import types
|
import types
|
||||||
|
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
|
||||||
import oslo_messaging as messaging
|
import oslo_messaging as messaging
|
||||||
|
|
||||||
from murano.common import uuidutils
|
from murano.common import uuidutils
|
||||||
from murano.dsl import dsl
|
from murano.dsl import dsl
|
||||||
|
|
||||||
CONF = cfg.CONF
|
CONF = cfg.CONF
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
@dsl.name('io.murano.system.StatusReporter')
|
@dsl.name('io.murano.system.StatusReporter')
|
||||||
|
@@ -14,7 +14,6 @@
|
|||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
|
||||||
|
|
||||||
import testtools
|
import testtools
|
||||||
|
|
||||||
@@ -23,7 +22,6 @@ from murano.dsl import helpers
|
|||||||
|
|
||||||
|
|
||||||
CONF = cfg.CONF
|
CONF = cfg.CONF
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
@dsl.name('io.murano.test.TestFixture')
|
@dsl.name('io.murano.test.TestFixture')
|
||||||
|
Reference in New Issue
Block a user