github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 03:03:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #12909 from justinsb/fix_12855

Browse Source 
AWS: Always install aufs module & tools
This commit is contained in:
Wojciech Tyczynski 2015-08-20 08:26:47 +02:00
commit 04af904cbb
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cluster/aws/templates/format-disks.sh
View File

@ -55,12 +55,6 @@ docker_storage=${DOCKER_STORAGE:-aufs}
if [[ ${#block_devices[@]} == 0 ]]; then
echo "No ephemeral block devices found; will use aufs on root"
docker_storage="aufs"
# Install aufs kernel module (for ubuntu)
apt-get install --yes linux-image-extra-$(uname -r)
# Install aufs tools (for debian)
apt-get install --yes aufs-tools
else
echo "Block devices: ${block_devices[@]}"
@ -174,6 +168,9 @@ elif [[ ${docker_storage} == "aufs-nolvm" || ${docker_storage} == "aufs" ]]; the
# Install aufs kernel module
apt-get install --yes linux-image-extra-$(uname -r)
# Install aufs tools
apt-get install --yes aufs-tools
DOCKER_OPTS="${DOCKER_OPTS} -s aufs"
elif [[ ${docker_storage} == "devicemapper" ]]; then
DOCKER_OPTS="${DOCKER_OPTS} -s devicemapper"