openstack/kolla-ansible
Code Issues Proposed changes

Merge "Switch Ubuntu to overlay2 docker driver"

Browse Source
This commit is contained in:
Jenkins 2016-12-23 13:39:04 +00:00 committed by Gerrit Code Review
commit f3f2a215bc
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/setup_Debian.sh
View File

@ -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
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