Merge "Limit non tripleo nodepool nodes to 8GB of RAM"
This commit is contained in:
commit
44eb8fd955
@ -25,5 +25,4 @@ ALL_MYSQL_PRIVS='true'
|
||||
|
||||
./prepare_node.sh "$HOSTNAME" "$SUDO" "$BARE" "$PYTHON3" "$PYPY" "$ALL_MYSQL_PRIVS"
|
||||
|
||||
sync
|
||||
sleep 5
|
||||
./restrict_memory.sh
|
||||
|
@ -23,5 +23,4 @@ BARE='true'
|
||||
./prepare_node.sh "$HOSTNAME" "$SUDO" "$BARE"
|
||||
sudo -u jenkins -i /opt/nodepool-scripts/prepare_devstack.sh $HOSTNAME
|
||||
|
||||
sync
|
||||
sleep 5
|
||||
./restrict_memory.sh
|
||||
|
@ -23,5 +23,4 @@ BARE='true'
|
||||
./prepare_node.sh "$HOSTNAME" "$SUDO" "$BARE"
|
||||
sudo -u jenkins -i /opt/nodepool-scripts/prepare_devstack_new_kernel.sh $HOSTNAME
|
||||
|
||||
sync
|
||||
sleep 5
|
||||
./restrict_memory.sh
|
||||
|
@ -24,3 +24,5 @@ PYPY='true'
|
||||
ALL_MYSQL_PRIVS='true'
|
||||
|
||||
./prepare_node.sh "$HOSTNAME" "$SUDO" "$BARE" "$PYTHON3" "$PYPY" "$ALL_MYSQL_PRIVS"
|
||||
|
||||
./restrict_memory.sh
|
||||
|
30
modules/openstack_project/files/nodepool/scripts/restrict_memory.sh
Executable file
30
modules/openstack_project/files/nodepool/scripts/restrict_memory.sh
Executable file
@ -0,0 +1,30 @@
|
||||
#!/bin/bash -xe
|
||||
# Copyright (C) 2014 Hewlett-Packard Development Company, L.P.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
# implied.
|
||||
#
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# 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
|
||||
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
|
||||
sudo sed -i -e 's/^timeout=[0-9]\+/timeout=0/' -e 's/\(^\s\+kernel.*\)/\1 mem=8G/' /boot/grub/grub.conf
|
||||
fi
|
||||
|
||||
sync
|
||||
sleep 5
|
Loading…
x
Reference in New Issue
Block a user