openstack
/
trove
Code Issues Proposed changes

Merge "Add i18n tranlation to common 4/5"

This commit is contained in:
Jenkins 2017-01-18 03:09:19 +00:00 committed by Gerrit Code Review
parent 38e382fb58 e730ec3b8e
commit 422f7ac25f
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
trove/common/strategies/cluster/experimental/galera_common/taskmanager.py
View File

@ -78,7 +78,8 @@ class GaleraCommonClusterTasks(task_models.ClusterTasks):
LOG.debug("Waiting for instances to get to cluster-ready status.")
# Wait for cluster members to get to cluster-ready status.
if not self._all_instances_ready(instance_ids, cluster_id):
raise TroveError("Instances in cluster did not report ACTIVE")
raise TroveError(_("Instances in cluster did not report "
"ACTIVE"))
LOG.debug("All members ready, proceeding for cluster setup.")
instances = [Instance.load(context, instance_id) for instance_id
@ -173,8 +174,8 @@ class GaleraCommonClusterTasks(task_models.ClusterTasks):
for db_inst in db_instances
if db_inst.id not in new_instance_ids]
if not existing_instances:
raise TroveError("Unable to determine existing cluster "
"member(s)")
raise TroveError(_("Unable to determine existing cluster "
"member(s)"))
# get list of ips of existing cluster members
existing_cluster_ips = [self.get_ip(instance) for instance in
@ -187,7 +188,8 @@ class GaleraCommonClusterTasks(task_models.ClusterTasks):
# Wait for cluster members to get to cluster-ready status.
if not self._all_instances_ready(new_instance_ids, cluster_id):
raise TroveError("Instances in cluster did not report ACTIVE")
raise TroveError(_("Instances in cluster did not report "
"ACTIVE"))
LOG.debug("All members ready, proceeding for cluster setup.")

4
trove/common/strategies/cluster/experimental/redis/taskmanager.py
View File

@ -112,8 +112,8 @@ class RedisClusterTasks(task_models.ClusterTasks):
for db_inst in db_instances
if db_inst.id not in new_instance_ids)
if not cluster_head:
raise TroveError("Unable to determine existing Redis cluster "
"member")
raise TroveError(_("Unable to determine existing Redis cluster"
" member"))
(cluster_head_ip, cluster_head_port) = (
self.get_guest(cluster_head).get_node_ip())