All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 91df9e96 authored by David Johnson's avatar David Johnson

Fix a couple bugs.

parent 8fb6ef3e
Pipeline #1363 skipped
......@@ -1126,7 +1126,8 @@ class CapnetWorkflowAgentManager(object):
cmd = [ 'ip','netns','exec',str(wfagent.namespace),
self.wfapp_launcher,pidfile,logfile,interface_name,
wfagent.wfapp_path ]
if 'wfapp_args' in wfagent and len(wfagent.wfapp_args) > 0:
if 'wfapp_args' in wfagent and wfagent.wfapp_args is not None \
and len(wfagent.wfapp_args) > 0:
cmd.extend(wfagent.wfapp_args.split(' '))
pass
agent_utils.execute(cmd,run_as_root=True)
......@@ -1169,7 +1170,7 @@ class CapnetWorkflowAgentManager(object):
self.ifdriver.unplug(wfagent.binding.device_name,
namespace=wfagent.namespace)
else:
LOG.debug('No interface exists for network %s', network.id)
LOG.debug('No interface exists for wfagent %s', wfagent.id)
if wfagent.binding and wfagent.binding.port:
self.agent.capnet_ext_plugin_rpc.wfagent_port_delete(
......
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