Skip to content

Commit

Permalink
Merge pull request kubernetes#13527 from derekwaynecarr/disable_swap
Browse files Browse the repository at this point in the history
Disable swap memory on vagrant nodes to support qos properly
  • Loading branch information
Quinton Hoole committed Sep 4, 2015
2 parents 7bbe516 + 44e74b4 commit de3cf9b
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions cluster/vagrant/provision-minion.sh
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,10 @@ grains:
docker_opts: '$(echo "$DOCKER_OPTS" | sed -e "s/'/''/g")'
EOF

# QoS support requires that swap memory is disabled on each of the minions
echo "Disable swap memory to ensure proper QoS"
swapoff -a

# we will run provision to update code each time we test, so we do not want to do salt install each time
if ! which salt-minion >/dev/null 2>&1; then
# Install Salt
Expand Down

0 comments on commit de3cf9b

Please sign in to comment.