commit a61b4704871e7b0ae88a50932576e961eca615e4
author Zuul <zuul@review.openstack.org> Fri Nov 02 15:29:37 2018 +0000
committer Gerrit Code Review <review@openstack.org> Fri Nov 02 15:29:37 2018 +0000
tree c827cd4d030ba19c0b9fb18f5210b640c5e3212d
parent ee9846132dcdb6ee8f87e592da433b0101e950f4
parent 770690eda1c4578dcca5c5cdfed6688e7e084b24

Merge "Remove cgroup natty or less block"

lib/nova

diff --git a/lib/nova b/lib/nova
index 8b49116..d1d0b3c 100644
--- a/lib/nova
+++ b/lib/nova
@@ -303,17 +303,6 @@
             # to simulate multiple systems.
             if [[ "$LIBVIRT_TYPE" == "lxc" ]]; then
                 if is_ubuntu; then
-                    if [[ ! "$DISTRO" > natty ]]; then
-                        local cgline="none /cgroup cgroup cpuacct,memory,devices,cpu,freezer,blkio 0 0"
-                        sudo mkdir -p /cgroup
-                        if ! grep -q cgroup /etc/fstab; then
-                            echo "$cgline" | sudo tee -a /etc/fstab
-                        fi
-                        if ! mount -n | grep -q cgroup; then
-                            sudo mount /cgroup
-                        fi
-                    fi
-
                     # enable nbd for lxc unless you're using an lvm backend
                     # otherwise you can't boot instances
                     if [[ "$NOVA_BACKEND" != "LVM" ]]; then