opendev/system-config
Code Issues Proposed changes

Merge "Restrict nodepool memory only when possible"

Browse Source
This commit is contained in:
Jenkins 2014-03-14 16:12:27 +00:00 committed by Gerrit Code Review
commit 8557b25c10
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/openstack_project/files/nodepool/scripts/restrict_memory.sh
View File

@ -18,11 +18,10 @@
# Limit all test slaves to 8GB of memory so that larger flavors with more
# cpu resources can be used without the risk of becoming dependent on more
# memory.
OS_FACT=$(facter operatingsystem)
if [ "$OS_FACT" == "Ubuntu" ] ; then
if [ -f /etc/default/grub ] ; then
sudo sed -i -e 's/^GRUB_TIMEOUT=[0-9]\+/GRUB_TIMEOUT=0/' -e 's/#\?GRUB_CMDLINE_LINUX=""/GRUB_CMDLINE_LINUX="mem=8G"/g' /etc/default/grub
sudo update-grub
elif [ "$OS_FACT" == "CentOS" ] || [ "$OS_FACT" == "Fedora" ] ; then
elif [ -f /boot/grub/grub.conf ] ; then
sudo sed -i -e 's/^timeout=[0-9]\+/timeout=0/' -e 's/\(^\s\+kernel.*\)/\1 mem=8G/' /boot/grub/grub.conf
fi