Browse Source

Merge "Don't create LOG if not logging"

changes/28/759328/1
Zuul 11 months ago
committed by Gerrit Code Review
parent
commit
60e78e48e6
  1. 3
      cinder/api/contrib/quotas.py
  2. 3
      cinder/image/accelerator.py
  3. 2
      cinder/volume/drivers/netapp/dataontap/utils/utils.py

3
cinder/api/contrib/quotas.py

@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_log import log as logging
from oslo_utils import strutils
import webob
@ -29,8 +28,6 @@ from cinder import quota
from cinder import quota_utils
from cinder import utils
LOG = logging.getLogger(__name__)
QUOTAS = quota.QUOTAS
GROUP_QUOTAS = quota.GROUP_QUOTAS
NON_QUOTA_KEYS = quota.NON_QUOTA_KEYS

3
cinder/image/accelerator.py

@ -14,14 +14,11 @@
import abc
from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import importutils
from cinder import exception
from cinder.i18n import _
LOG = logging.getLogger(__name__)
CONF = cfg.CONF
# NOTE(ZhengMa): The order of the option is improtant, accelerators

2
cinder/volume/drivers/netapp/dataontap/utils/utils.py

@ -20,7 +20,6 @@ import json
import socket
from oslo_config import cfg
from oslo_log import log
from cinder import exception
from cinder.i18n import _
@ -30,7 +29,6 @@ from cinder.volume import driver
from cinder.volume.drivers.netapp.dataontap.client import client_cmode
from cinder.volume.drivers.netapp import options as na_opts
LOG = log.getLogger(__name__)
CONF = cfg.CONF

Loading…
Cancel
Save