openstack/sahara-plugin-mapr
Code Issues Proposed changes

Migrate to oslo.log

Browse Source 
oslo.log was added to global requirements, so we can migrate to this module.
Also we need this migration to be ensure that it works correctly with
log-improvements.

Since openstack.common.log is not dropped in oslo-incubator,
we shouldn't remove it.

Change-Id: I90468e4db812ae0b5d8a43a37206b236f8904661
Closes-bug: #1412673
This commit is contained in:
Vitaly Gridnev 2015-01-21 12:50:45 +03:00
parent e24a02b9a0
commit ffc430d572
8 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
requirements.txt
View File

@ -16,6 +16,7 @@ oslo.concurrency>=1.4.1 # Apache-2.0
oslo.context>=0.1.0 # Apache-2.0 oslo.context>=0.1.0 # Apache-2.0
oslo.db>=1.4.1 # Apache-2.0 oslo.db>=1.4.1 # Apache-2.0
oslo.i18n>=1.3.0 # Apache-2.0 oslo.i18n>=1.3.0 # Apache-2.0
oslo.log>=0.1.0 # Apache-2.0
oslo.messaging>=1.4.0,!=1.5.0 oslo.messaging>=1.4.0,!=1.5.0
oslo.middleware>=0.3.0 # Apache-2.0 oslo.middleware>=0.3.0 # Apache-2.0
oslo.rootwrap>=1.3.0 oslo.rootwrap>=1.3.0

2
sahara/plugins/mapr/util/config.py
View File

@ -13,11 +13,11 @@
# under the License. # under the License.
from oslo.config import cfg from oslo.config import cfg
from oslo_log import log as logging
from sahara import exceptions as ex from sahara import exceptions as ex
from sahara.i18n import _ from sahara.i18n import _
from sahara.i18n import _LI from sahara.i18n import _LI
from sahara.openstack.common import log as logging
import sahara.plugins.mapr.util.config_file_utils as cfu import sahara.plugins.mapr.util.config_file_utils as cfu
import sahara.plugins.mapr.versions.version_handler_factory as vhf import sahara.plugins.mapr.versions.version_handler_factory as vhf
from sahara.plugins import provisioning as p from sahara.plugins import provisioning as p

2
sahara/plugins/mapr/util/plugin_spec.py
View File

@ -15,9 +15,9 @@
import json import json
import os.path import os.path
from oslo_log import log as logging
import six import six
import sahara.openstack.common.log as logging
import sahara.plugins.mapr.util.config_file_utils as cfu import sahara.plugins.mapr.util.config_file_utils as cfu
import sahara.plugins.mapr.util.dict_utils as du import sahara.plugins.mapr.util.dict_utils as du
import sahara.plugins.mapr.util.func_utils as fu import sahara.plugins.mapr.util.func_utils as fu

3
sahara/plugins/mapr/util/run_scripts.py
View File

@ -12,8 +12,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from oslo_log import log as logging
from sahara.i18n import _LI from sahara.i18n import _LI
from sahara.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

3
sahara/plugins/mapr/util/scaling.py
View File

@ -12,9 +12,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from oslo_log import log as logging
from sahara import context from sahara import context
from sahara.i18n import _LI from sahara.i18n import _LI
from sahara.openstack.common import log as logging
from sahara.plugins.mapr.util import config from sahara.plugins.mapr.util import config
from sahara.plugins.mapr.util import names from sahara.plugins.mapr.util import names
from sahara.plugins.mapr.util import run_scripts from sahara.plugins.mapr.util import run_scripts

3
sahara/plugins/mapr/util/start_helper.py
View File

@ -12,9 +12,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from oslo_log import log as logging
from sahara import context from sahara import context
from sahara.i18n import _LI from sahara.i18n import _LI
from sahara.openstack.common import log as logging
from sahara.plugins.mapr.util import names from sahara.plugins.mapr.util import names
from sahara.plugins.mapr.util import run_scripts from sahara.plugins.mapr.util import run_scripts
import sahara.plugins.mapr.versions.version_handler_factory as vhf import sahara.plugins.mapr.versions.version_handler_factory as vhf

2
sahara/plugins/mapr/versions/base_cluster_configurer.py
View File

@ -16,10 +16,10 @@ import abc
import collections as c import collections as c
import os import os
from oslo_log import log as logging
import six import six
from sahara.i18n import _LI from sahara.i18n import _LI
from sahara.openstack.common import log as logging
import sahara.plugins.mapr.util.cluster_helper as ch import sahara.plugins.mapr.util.cluster_helper as ch
import sahara.plugins.mapr.util.cluster_info as ci import sahara.plugins.mapr.util.cluster_info as ci
from sahara.plugins.mapr.util import config from sahara.plugins.mapr.util import config

3
sahara/plugins/mapr/versions/v4_0_1_mrv1/cluster_configurer.py
View File

@ -12,8 +12,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from oslo_log import log as logging
from sahara.i18n import _LI from sahara.i18n import _LI
from sahara.openstack.common import log as logging
import sahara.plugins.mapr.versions.base_cluster_configurer as bcc import sahara.plugins.mapr.versions.base_cluster_configurer as bcc
import sahara.plugins.utils as u import sahara.plugins.utils as u
from sahara.utils import files as f from sahara.utils import files as f