diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2019-11-11 08:35:03 +0000 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2019-11-11 09:35:11 +0000 |
| commit | d5e00a369ffef5edf929ef5b03b7c544021b2e41 (patch) | |
| tree | b55c180af74ebe317ea907c4407d5c14a0d66792 | |
| parent | e0fe7ad52881f202935ed84e638b954742d52f8b (diff) | |
FIX: Paths for new Docker images
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: Ia39ff6445e4029a78d008d5690661610a1e9ed50
| -rw-r--r-- | resources/libraries/python/ContainerUtils.py | 17 | ||||
| -rw-r--r-- | resources/libraries/python/DUTSetup.py | 3 |
2 files changed, 10 insertions, 10 deletions
diff --git a/resources/libraries/python/ContainerUtils.py b/resources/libraries/python/ContainerUtils.py index b02033eeb9..50868cb8f2 100644 --- a/resources/libraries/python/ContainerUtils.py +++ b/resources/libraries/python/ContainerUtils.py @@ -398,6 +398,7 @@ class ContainerEngine(object): self.execute('sleep 3; apt-get update') self.execute('apt-get install -y supervisor') self.execute('echo "{config}" > {config_file} && ' + 'unlink /tmp/supervisor.sock && ' 'supervisord -c {config_file}'. format( config='[unix_http_server]\n' @@ -411,9 +412,9 @@ class ContainerEngine(object): 'pidfile = /tmp/supervisord.pid\n' 'identifier = supervisor\n' 'directory = /tmp\n' - 'logfile=/tmp/supervisord.log\n' - 'loglevel=debug\n' - 'nodaemon=false\n\n', + 'logfile = /tmp/supervisord.log\n' + 'loglevel = debug\n' + 'nodaemon = false\n\n', config_file=SUPERVISOR_CONF)) def start_vpp(self): @@ -421,11 +422,11 @@ class ContainerEngine(object): self.execute('echo "{config}" >> {config_file}'. format( config='[program:vpp]\n' - 'command=/usr/bin/vpp -c /etc/vpp/startup.conf\n' - 'autostart=false\n' - 'autorestart=false\n' - 'redirect_stderr=true\n' - 'priority=1', + 'command = /usr/bin/vpp -c /etc/vpp/startup.conf\n' + 'autostart = false\n' + 'autorestart = false\n' + 'redirect_stderr = true\n' + 'priority = 1', config_file=SUPERVISOR_CONF)) self.execute('supervisorctl reload') self.execute('supervisorctl start vpp') diff --git a/resources/libraries/python/DUTSetup.py b/resources/libraries/python/DUTSetup.py index 95b23018af..9ae06c138e 100644 --- a/resources/libraries/python/DUTSetup.py +++ b/resources/libraries/python/DUTSetup.py @@ -33,8 +33,7 @@ class DUTSetup(object): :type service: str """ if DUTSetup.running_in_container(node): - command = ('echo $(< /var/log/supervisord.log);' - 'echo $(< /tmp/*supervisor*.log)') + command = ('echo $(< /tmp/*supervisor*.log)') else: command = ('journalctl --no-pager --unit={name} ' '--since="$(echo `systemctl show -p ' |