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
... | ... |
@@ -303,17 +303,6 @@ function configure_nova { |
303 | 303 |
# to simulate multiple systems. |
304 | 304 |
if [[ "$LIBVIRT_TYPE" == "lxc" ]]; then |
305 | 305 |
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 |
- |
|
317 | 306 |
# enable nbd for lxc unless you're using an lvm backend |
318 | 307 |
# otherwise you can't boot instances |
319 | 308 |
if [[ "$NOVA_BACKEND" != "LVM" ]]; then |