openstack
/
sahara
Code Issues Proposed changes

Merge "Fix wrong instance count in provision events"

This commit is contained in:
Jenkins 2016-08-28 16:23:12 +00:00 committed by Gerrit Code Review
parent 4eda72171f 49d0e30cb3
commit 632b2a9120
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sahara/plugins/mapr/domain/service.py
View File

@ -80,6 +80,9 @@ class Service(object):
return self._ui_info
def install(self, cluster_context, instances):
service_instances = cluster_context.filter_instances(instances,
service=self)
@el.provision_step(_("Install %s service") % self.ui_name,
cluster_context_reference=0, instances_reference=1)
def _install(_context, _instances):
@ -87,7 +90,7 @@ class Service(object):
self._install_packages_on_instance,
_context)
_install(cluster_context, instances)
_install(cluster_context, service_instances)
@el.provision_event(instance_reference=1)
def _install_packages_on_instance(self, instance, cluster_context):

15
sahara/plugins/mapr/services/swift/swift.py
View File

@ -17,6 +17,7 @@ from oslo_log import log as logging
import sahara.plugins.mapr.domain.service as s
import sahara.plugins.mapr.services.maprfs.maprfs as maprfs
import sahara.plugins.mapr.util.event_log as el
import sahara.utils.files as f
LOG = logging.getLogger(__name__)
@ -32,15 +33,25 @@ class Swift(s.Service):
self._ui_name = 'Swift'
self._cluster_defaults = ['swift-default.json']
def install(self, cluster_context, instances):
# swift does not require any package
pass
def configure(self, context, instances=None):
instances = instances or context.get_instances()
file_servers = context.filter_instances(instances, maprfs.FILE_SERVER)
self._install_swift_jar(context, file_servers)
@el.provision_step("Install Swift service")
def _install_swift_jar(self, context, instances):
LOG.debug('Installing Swift jar')
jar = f.get_file_text(Swift.HADOOP_SWIFT_JAR)
path = '%s/swift.jar' % context.hadoop_lib
for instance in instances:
with instance.remote() as r:
@el.provision_event()
def install_on_instance(inst):
with inst.remote() as r:
r.write_file_to(path, jar, run_as_root=True)
for instance in instances:
install_on_instance(instance)