Skip to content
Snippets Groups Projects
Commit f3f2a215 authored by Jenkins's avatar Jenkins Committed by Gerrit Code Review
Browse files

Merge "Switch Ubuntu to overlay2 docker driver"

parents ef7dc8d5 fc2bb3f3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 3 deletions
tools/setup_Debian.sh
+ 4
− 3
View file @ f3f2a215
...@@ -57,11 +57,12 @@ source /etc/lsb-release ...@@ -57,11 +57,12 @@ source /etc/lsb-release
echo "deb http://apt.dockerproject.org/repo ubuntu-${DISTRIB_CODENAME} main" | sudo tee /etc/apt/sources.list.d/docker.list echo "deb http://apt.dockerproject.org/repo ubuntu-${DISTRIB_CODENAME} main" | sudo tee /etc/apt/sources.list.d/docker.list
add_key add_key
sudo apt-get update sudo apt-get update
sudo apt-get -y install --no-install-recommends docker-engine btrfs-tools sudo apt-get -y install --no-install-recommends docker-engine
sudo service docker stop sudo service docker stop
setup_disk
if [[ ${DISTRIB_CODENAME} == "trusty" ]]; then if [[ ${DISTRIB_CODENAME} == "trusty" ]]; then
sudo apt-get -y install --no-install-recommends btrfs-tools
setup_disk
echo 'DOCKER_OPTS="-s btrfs"' | sudo tee /etc/default/docker echo 'DOCKER_OPTS="-s btrfs"' | sudo tee /etc/default/docker
sudo mount --make-shared /run sudo mount --make-shared /run
sudo service docker start sudo service docker start
...@@ -70,7 +71,7 @@ else ...@@ -70,7 +71,7 @@ else
sudo tee /etc/systemd/system/docker.service.d/kolla.conf << EOF sudo tee /etc/systemd/system/docker.service.d/kolla.conf << EOF
[Service] [Service]
ExecStart= ExecStart=
ExecStart=/usr/bin/dockerd --storage-driver btrfs ExecStart=/usr/bin/dockerd --storage-driver overlay2
MountFlags=shared MountFlags=shared
EOF EOF
sudo systemctl daemon-reload sudo systemctl daemon-reload
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment