diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2018-08-11 15:07:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-11 15:07:29 -0400 |
| commit | 7d116f5f73520e6db389f28e9963f0137a27d52d (patch) | |
| tree | 730fba1d59f4fe3877cffc6d65e4fce57fcb7fdd /contrib | |
| parent | 3ef9279cec43ca7e24fb00eb838d85e30b7e37f7 (diff) | |
| parent | a9b73abf8fcfdcbd9c767987ab5b24089332d004 (diff) | |
| download | podman-7d116f5f73520e6db389f28e9963f0137a27d52d.tar.gz podman-7d116f5f73520e6db389f28e9963f0137a27d52d.tar.bz2 podman-7d116f5f73520e6db389f28e9963f0137a27d52d.zip | |
Merge pull request #1254 from mheon/systemd_cgroups_default
Switch default CGroup manager to systemd
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/python/podman/test/podman_testcase.py | 1 | ||||
| -rwxr-xr-x | contrib/python/podman/test/test_runner.sh | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/contrib/python/podman/test/podman_testcase.py b/contrib/python/podman/test/podman_testcase.py index f96a3a013..731fa26fc 100644 --- a/contrib/python/podman/test/podman_testcase.py +++ b/contrib/python/podman/test/podman_testcase.py @@ -39,6 +39,7 @@ class PodmanTestCase(unittest.TestCase): tmpdir = os.environ.get('TMPDIR', '/tmp') podman_args = [ '--storage-driver=vfs', + '--cgroup-manager=cgroupfs', '--root={}/crio'.format(tmpdir), '--runroot={}/crio-run'.format(tmpdir), '--cni-config-dir={}/cni/net.d'.format(tmpdir), diff --git a/contrib/python/podman/test/test_runner.sh b/contrib/python/podman/test/test_runner.sh index 4afbc260f..c37d9cf6e 100755 --- a/contrib/python/podman/test/test_runner.sh +++ b/contrib/python/podman/test/test_runner.sh @@ -111,6 +111,7 @@ PODMAN_ARGS="--storage-driver=vfs \ --root=${TMPDIR}/crio \ --runroot=${TMPDIR}/crio-run \ --cni-config-dir=$CNI_CONFIG_PATH \ + --cgroup-manager=cgroupfs \ " if [[ -n $VERBOSE ]]; then PODMAN_ARGS="$PODMAN_ARGS --log-level=$LOG_LEVEL" |