Browse Source

Merge branch 'wip-sh' into 'master'

enough: _tty_out=False to avoid escape sequences

See merge request main/infrastructure!351
keep-around/289ffea032a5ef096c90602d0faaa90cc14055d5
Loïc Dachary 10 months ago
parent
commit
289ffea032
  1. 2
      enough/common/docker.py
  2. 1
      enough/common/openstack.py

2
enough/common/docker.py

@ -30,6 +30,7 @@ class Docker(object):
self.docker = sh.Command(cmd).bake(
_truncate_exc=False,
_tee=True,
_tty_out=False,
_out=lambda x: log.info(x.strip()),
_err=lambda x: log.info(x.strip()),
)
@ -49,6 +50,7 @@ class Docker(object):
'--file', compose.name,
_truncate_exc=False,
_tee=True,
_tty_out=False,
_out=lambda x: log.info(x.strip()),
_err=lambda x: log.info(x.strip()),
)

1
enough/common/openstack.py

@ -32,6 +32,7 @@ class OpenStackBase(object):
self.o = sh.openstack.bake(
'--os-cloud', kwargs.get('cloud', 'production'),
_tee=True,
_tty_out=False,
_out=lambda x: log.info(x.strip()),
_err=lambda x: log.info(x.strip()),
_env={'OS_CLIENT_CONFIG_FILE': self.config_file},

Loading…
Cancel
Save