diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-12-19 13:31:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-12-19 13:31:18 +0000 |
| commit | 82ab3258c19d458782a051aa42290ad2ca36e55c (patch) | |
| tree | 71a2114b19b3172d10b53a79a313421f803d338c | |
| parent | 44d6cffa4d08a0cd87004a40c545c7a7c937532e (diff) | |
| parent | a81d48e703f84c75b92369114d51751fb8d3d738 (diff) | |
| download | kolla-82ab3258c19d458782a051aa42290ad2ca36e55c.tar.gz kolla-82ab3258c19d458782a051aa42290ad2ca36e55c.zip | |
Merge "Switch Ubuntu to overlay2 docker driver"
| -rwxr-xr-x | tools/setup_Debian.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/setup_Debian.sh b/tools/setup_Debian.sh index 2ea203969..deb645bd4 100755 --- a/tools/setup_Debian.sh +++ b/tools/setup_Debian.sh @@ -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 add_key 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 -setup_disk 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 sudo mount --make-shared /run sudo service docker start @@ -70,7 +71,7 @@ else sudo tee /etc/systemd/system/docker.service.d/kolla.conf << EOF [Service] ExecStart= -ExecStart=/usr/bin/dockerd --storage-driver btrfs --insecure-registry=127.0.0.1:4000 +ExecStart=/usr/bin/dockerd --storage-driver overlay2 --insecure-registry=127.0.0.1:4000 MountFlags=shared EOF sudo systemctl daemon-reload |