Commit e15360e4 authored by Swann Perarnau's avatar Swann Perarnau

[fix] bad init for containers

parent 8c547615
Pipeline #5095 passed with stages
in 5 minutes and 59 seconds
from __future__ import print_function from __future__ import print_function
from applications import ApplicationManager from applications import ApplicationManager
from containers import ContainerManager, NodeOSContainerRuntime from containers import ContainerManager, NodeOSRuntime
from controller import Controller, PowerActuator from controller import Controller, PowerActuator
from powerpolicy import PowerPolicyManager from powerpolicy import PowerPolicyManager
from functools import partial from functools import partial
...@@ -85,6 +85,7 @@ class Daemon(object): ...@@ -85,6 +85,7 @@ class Daemon(object):
self.upstream_rpc_server.sendmsg(RPC_MSG['getpower'](**update), self.upstream_rpc_server.sendmsg(RPC_MSG['getpower'](**update),
client) client)
elif msg.type == 'run': elif msg.type == 'run':
logger.info("asked to run a command in a container: %r", msg)
container_uuid = msg.container_uuid container_uuid = msg.container_uuid
params = {'manifest': msg.manifest, params = {'manifest': msg.manifest,
'file': msg.path, 'file': msg.path,
...@@ -297,13 +298,12 @@ class Daemon(object): ...@@ -297,13 +298,12 @@ class Daemon(object):
# create managers # create managers
self.resource_manager = ResourceManager(hwloc=self.config.hwloc) self.resource_manager = ResourceManager(hwloc=self.config.hwloc)
container_runtime = \ container_runtime = \
NodeOSContainerRuntime(self.config.argo_nodeos_config) NodeOSRuntime(self.config.argo_nodeos_config)
self.container_manager = ContainerManager( self.container_manager = ContainerManager(
container_runtime, container_runtime,
self.resource_manager, self.resource_manager,
perfwrapper=self.config.argo_perf_wrapper, perfwrapper=self.config.argo_perf_wrapper,
linuxperf=self.config.perf, linuxperf=self.config.perf,
argo_nodeos_config=self.config.argo_nodeos_config,
pmpi_lib=self.config.pmpi_lib, pmpi_lib=self.config.pmpi_lib,
) )
self.application_manager = ApplicationManager() self.application_manager = ApplicationManager()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment