diff options
| author | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-07-29 17:26:49 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-07-29 17:30:10 +0800 |
| commit | 08985a0d79acc90c0711b466950529ba79eff5de (patch) | |
| tree | fcd1edf3b518ab6984bf8358b5e7ecbd36dc9705 | |
| parent | c8950340300738e52f21f3e537ae2630d7f39e13 (diff) | |
| download | kolla-08985a0d79acc90c0711b466950529ba79eff5de.tar.gz kolla-08985a0d79acc90c0711b466950529ba79eff5de.zip | |
Use /etc file to overwrite the docker.service file
Docker engine is updated to 1.12. The docker.service in the rpm is
change. Use the /etc/systemd/system/docker.service.d/kolla.conf file to
overwrite the default parameters
TrivialFix
Change-Id: Ice56808f4a1ce1ee57bf5e48c779d033ea6c759c
| -rwxr-xr-x | tools/setup_RedHat.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tools/setup_RedHat.sh b/tools/setup_RedHat.sh index be4b3ec32..f9e6a4fe3 100755 --- a/tools/setup_RedHat.sh +++ b/tools/setup_RedHat.sh @@ -49,8 +49,14 @@ sudo yum -y install libffi-devel openssl-devel docker-engine btrfs-progs 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 mkdir /etc/systemd/system/docker.service.d +sudo tee /etc/systemd/system/docker.service.d/kolla.conf << EOF +[Service] +ExecStart= +ExecStart=/usr/bin/dockerd --storage-driver btrfs +MountFlags=shared +EOF + sudo systemctl daemon-reload sudo systemctl start docker |