openstack/zun
Code Issues Proposed changes

Getting the workdir of docker by CONF

Browse Source 
Change-Id: Ie605dd07b3cc4e117a431f6648d4a5385057a86e
This commit is contained in:
Feng Shengqin 2018-04-09 18:12:26 +08:00
parent dbcd282f77
commit 646d2548df
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zun/container/docker/host.py
View File

@ -20,8 +20,10 @@ from oslo_log import log as logging
from zun.common import consts
from zun.common import exception
from zun.common import utils
import zun.conf
from zun.container.docker import utils as docker_utils
CONF = zun.conf.CONF
LOG = logging.getLogger(__name__)
@ -74,10 +76,10 @@ class Host(object):
if backing_filesystem == 'xfs':
# Check project quota mount option
try:
utils.execute(
"mount | grep $(df /var/lib/docker | "
"awk 'FNR==2 {print $1}') |grep 'xfs' |"
" grep -E 'pquota|prjquota'", shell=True)
cmd = "mount |grep $(df " + CONF.docker.docker_data_root + \
" |awk 'FNR==2 {print $1}') | grep 'xfs'" \
" |grep 'pquota|prjquota'"
utils.execute(cmd, shell=True)
except exception.CommandError:
sp_disk_quota = False
else: