openstack
/
sahara-plugin-vanilla
Code Issues Proposed changes

Merge "Remove log translations"

This commit is contained in:
Jenkins 2017-04-17 15:59:05 +00:00 committed by Gerrit Code Review
parent 1fd5dceb35 935cfac9c4
commit c244f30924
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sahara/i18n.py
View File

@ -30,4 +30,3 @@ _ = _translators.primary
# name like '_'. The "L" is for "log" and the other letter comes from
# the level.
_LI = _translators.log_info
_LW = _translators.log_warning

6
sahara/plugins/vanilla/hadoop2/config.py
View File

@ -20,7 +20,6 @@ import six
from sahara import context
from sahara.i18n import _
from sahara.i18n import _LW
from sahara.plugins import utils
from sahara.plugins.vanilla.hadoop2 import config_helper as c_helper
from sahara.plugins.vanilla.hadoop2 import oozie_helper as o_helper
@ -419,9 +418,8 @@ def _make_hadoop_paths(paths, hadoop_dir):
True, step=_("Configure topology data"), param=('cluster', 1))
def configure_topology_data(pctx, cluster):
if c_helper.is_data_locality_enabled(pctx, cluster):
LOG.warning(_LW("Node group awareness is not implemented in YARN yet "
"so enable_hypervisor_awareness set to False "
"explicitly"))
LOG.warning("Node group awareness is not implemented in YARN yet "
"so enable_hypervisor_awareness set to False explicitly")
tpl_map = th.generate_topology_map(cluster, is_node_awareness=False)
topology_data = "\n".join(
[k + " " + v for k, v in tpl_map.items()]) + "\n"

5
sahara/plugins/vanilla/hadoop2/utils.py
View File

@ -19,7 +19,6 @@ from oslo_log import log as logging
from sahara import conductor as cond
from sahara import context
from sahara.i18n import _LW
from sahara.plugins.vanilla import utils as u
from sahara.service.castellan import utils as castellan
@ -70,7 +69,7 @@ def delete_oozie_password(cluster):
if 'oozie_pass_id' in extra:
castellan.delete_secret(extra['oozie_pass_id'])
else:
LOG.warning(_LW("Cluster hasn't Oozie password"))
LOG.warning("Cluster hasn't Oozie password")
def get_hive_password(cluster):
@ -87,4 +86,4 @@ def delete_hive_password(cluster):
if 'hive_pass_id' in extra:
castellan.delete_secret(extra['hive_pass_id'])
else:
LOG.warning(_LW("Cluster hasn't hive password"))
LOG.warning("Cluster hasn't hive password")