Skip to content

Commit 770690e

Browse files
committed
Remove cgroup natty or less block
Given that Natty and other releases that don't use cgroups have been out of support in Ubuntu for years now, it's high time we removed the special case code block that sets up the cgroup mount. Change-Id: I5403a4b1b64a95236b4dfcb66c35c594a3460cca
1 parent 53db72c commit 770690e

1 file changed

Lines changed: 0 additions & 11 deletions

File tree

lib/nova

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -303,17 +303,6 @@ function configure_nova {
303303
# to simulate multiple systems.
304304
if [[ "$LIBVIRT_TYPE" == "lxc" ]]; then
305305
if is_ubuntu; then
306-
if [[ ! "$DISTRO" > natty ]]; then
307-
local cgline="none /cgroup cgroup cpuacct,memory,devices,cpu,freezer,blkio 0 0"
308-
sudo mkdir -p /cgroup
309-
if ! grep -q cgroup /etc/fstab; then
310-
echo "$cgline" | sudo tee -a /etc/fstab
311-
fi
312-
if ! mount -n | grep -q cgroup; then
313-
sudo mount /cgroup
314-
fi
315-
fi
316-
317306
# enable nbd for lxc unless you're using an lvm backend
318307
# otherwise you can't boot instances
319308
if [[ "$NOVA_BACKEND" != "LVM" ]]; then

0 commit comments

Comments
 (0)