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_RedHat.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_RedHat.sh')
| -rwxr-xr-x | tools/setup_RedHat.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/setup_RedHat.sh b/tools/setup_RedHat.sh index a04638f58..f6d7fbeae 100755 --- a/tools/setup_RedHat.sh +++ b/tools/setup_RedHat.sh @@ -46,6 +46,7 @@ setup_disk # Setup Docker sudo sed -i -r 's,(ExecStart)=(.+),\1=/usr/bin/docker daemon --storage-driver btrfs,' /usr/lib/systemd/system/docker.service +sudo sed -i 's|^MountFlags=.*|MountFlags=shared|' /usr/lib/systemd/system/docker.service sudo systemctl daemon-reload sudo systemctl start docker |