openstack/deb-sahara
Code Issues Proposed changes

Merge "Update cluster UI info in MapR plugin"

Browse Source
This commit is contained in:
Jenkins 2015-08-25 21:43:17 +00:00 committed by Gerrit Code Review
commit a88040c541
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sahara/plugins/mapr/base/base_cluster_configurer.py
View File

@ -35,7 +35,6 @@ from sahara.topology import topology_helper as th
import sahara.utils.configs as sahara_configs import sahara.utils.configs as sahara_configs
import sahara.utils.files as files import sahara.utils.files as files
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
conductor = conductor.API conductor = conductor.API
@ -89,6 +88,7 @@ class BaseConfigurer(ac.AbstractConfigurer):
self._write_config_files(cluster_context, existing) self._write_config_files(cluster_context, existing)
self._update_services(cluster_context, existing) self._update_services(cluster_context, existing)
self._restart_services(cluster_context) self._restart_services(cluster_context)
self._update_cluster_info(cluster_context)
LOG.info(_LI('Existing instances successfully configured')) LOG.info(_LI('Existing instances successfully configured'))
def _configure_services(self, cluster_context, instances): def _configure_services(self, cluster_context, instances):
@ -216,14 +216,21 @@ class BaseConfigurer(ac.AbstractConfigurer):
LOG.debug('Updating UI information.') LOG.debug('Updating UI information.')
info = {} info = {}
for service in cluster_context.cluster_services: for service in cluster_context.cluster_services:
for uri_info in service.ui_info: for title, node_process, url_template in service.ui_info:
title, process, url = uri_info removed = cluster_context.removed_instances(node_process)
instance = cluster_context.get_instance(process) instances = cluster_context.get_instances(node_process)
info.update({ instances = [i for i in instances if i not in removed]
title: {
'WebUI': url % instance.management_ip if len(instances) == 1:
} display_name_template = "%(title)s"
}) else:
display_name_template = "%(title)s %(index)s"
for index, instance in enumerate(instances, start=1):
args = {"title": title, "index": index}
display_name = display_name_template % args
url = url_template % instance.management_ip
info.update({display_name: {"WebUI": url}})
ctx = context.ctx() ctx = context.ctx()
conductor.cluster_update(ctx, cluster_context.cluster, {'info': info}) conductor.cluster_update(ctx, cluster_context.cluster, {'info': info})
@ -300,8 +307,8 @@ class BaseConfigurer(ac.AbstractConfigurer):
def mapr_user_exists(self, instance): def mapr_user_exists(self, instance):
with instance.remote() as r: with instance.remote() as r:
ec, out = r.execute_command( ec, __ = r.execute_command(
'id -u mapr', run_as_root=True, raise_when_error=False) "id -u mapr", run_as_root=True, raise_when_error=False)
return ec == 0 return ec == 0
def post_start(self, c_context, instances=None): def post_start(self, c_context, instances=None):