openstack
/
charm-nova-lxd
Code Issues Proposed changes

Revert "Disable ext4 userns when running in a container" 

This reverts commit c0d0fc5041.

Change-Id: I995a77ecd8b73dc1577325dd05ccb7198df8e658
This commit is contained in:
James Page 2016-10-24 19:32:52 +00:00
parent c0d0fc5041
commit b9be248dc4
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hooks/lxd_utils.py
View File

@ -425,9 +425,7 @@ def configure_lxd_host():
if ubuntu_release >= 'xenial':
modprobe('netlink_diag')
# /sys is read-only when using a container
container_check = check_output(['systemd-detect-virt']).strip()
if (container_check != 'lxc' and os.path.exists(EXT4_USERNS_MOUNTS)):
if os.path.exists(EXT4_USERNS_MOUNTS):
with open(EXT4_USERNS_MOUNTS, 'w') as userns_mounts:
userns_mounts.write(
'Y\n' if config('enable-ext4-userns') else 'N\n'