diff options
| author | SamYaple <sam@yaple.net> | 2016-02-05 15:23:00 +0000 |
|---|---|---|
| committer | SamYaple <sam@yaple.net> | 2016-02-06 06:48:53 +0000 |
| commit | e8d66766f0c3c06003220df8c436af191210a7dd (patch) | |
| tree | 3baaaf5f26e149411bee58ef927eb8ba1d9bf1a1 /tools/setup_Debian.sh | |
| parent | fbc650e009e408e17d5b6c1aaf551fd572100aef (diff) | |
| download | kolla-e8d66766f0c3c06003220df8c436af191210a7dd.tar.gz kolla-e8d66766f0c3c06003220df8c436af191210a7dd.zip | |
Fix gate for docker 1.10
Docker 1.10 has broken the gate and this patch will correct that
breakage.
The issue comes with rsyslog. Due to a commit in Docker 1.10 [1] we
must change the way we get the log socket for rsyslog. The /dev/
folder will no longer populate as we used it. So instead we simply
make a new socket in a path we control and share that to the correct
location in the containers.
Additionally, adjust the gate for new Docker daemon.
[1] https://github.com/docker/docker/pull/16639
Partially-Implements: blueprint kolla-upgrade
Change-Id: I881a2ecdf6d7b35991e1d38a3f3e60d022d6577f
Diffstat (limited to 'tools/setup_Debian.sh')
| -rwxr-xr-x | tools/setup_Debian.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/setup_Debian.sh b/tools/setup_Debian.sh index f45b34ddc..49e2522f3 100755 --- a/tools/setup_Debian.sh +++ b/tools/setup_Debian.sh @@ -33,13 +33,14 @@ export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" # Setup Docker repo and add signing key echo 'deb http://apt.dockerproject.org/repo ubuntu-trusty main' | sudo tee /etc/apt/sources.list.d/docker.list -sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D +sudo apt-key adv --keyserver hkp://pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D sudo apt-get update sudo apt-get install -y --no-install-recommends docker-engine btrfs-tools sudo service docker stop setup_disk echo 'DOCKER_OPTS="-s btrfs"' | sudo tee /etc/default/docker +sudo mount --make-shared /run sudo service docker start sudo docker info |