openstack/devstack
Code Issues Proposed changes

Merge "Remove cgroup natty or less block"

Browse Source
This commit is contained in:
Zuul 2018-11-02 15:29:37 +00:00 committed by Gerrit Code Review
commit a61b470487
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/nova
View File

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