diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 37a70f284..bb23923ab 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -770,7 +770,7 @@ function run_k8s_kubelet { --root-dir=${KURYR_HYPERKUBE_DATA_DIR}/kubelet" if [[ ${CONTAINER_ENGINE} == 'docker' ]]; then - command+=" --cgroup-driver $(docker info|awk '/Cgroup/ {print $NF}')" + command+=" --cgroup-driver $(docker info -f '{{.CgroupDriver}}')" elif [[ ${CONTAINER_ENGINE} == 'crio' ]]; then local crio_conf crio_conf=/etc/crio/crio.conf diff --git a/test-requirements.txt b/test-requirements.txt index ffb5526b7..aaad1d7c4 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,6 +4,7 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 +bandit>=1.1.0,<=1.6.2 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 ddt>=1.0.1 # MIT docutils>=0.11 # OSI-Approved Open Source, Public Domain