aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorÉric Lemoine <elemoine@mirantis.com>2016-03-09 10:38:34 +0100
committerÉric Lemoine <elemoine@mirantis.com>2016-03-09 10:41:08 +0100
commit500dc73c87f54052a7f632ecd5eeefa3a86f7f49 (patch)
treebf0d63329573e1e9c19f49ceb3843f97ab0e9730 /docker
parent13a60622601a3fc8535c0ee8c10a1da2d0ea928b (diff)
downloadkolla-500dc73c87f54052a7f632ecd5eeefa3a86f7f49.tar.gz
kolla-500dc73c87f54052a7f632ecd5eeefa3a86f7f49.zip
Do not create /dev/log symlink if it already exists
This changes the keepalived extend_start.sh script not to recreate the /dev/log symlink if it already exists. This change is related to a comment from SamYaple in https://review.openstack.org/#/c/288432/. TrivialFix Change-Id: I9ca2b4d0b36c961ab3e1e18e2011dd10b47c33e3
Diffstat (limited to 'docker')
-rw-r--r--docker/keepalived/extend_start.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/keepalived/extend_start.sh b/docker/keepalived/extend_start.sh
index 18e71d1f7..0cb79767e 100644
--- a/docker/keepalived/extend_start.sh
+++ b/docker/keepalived/extend_start.sh
@@ -3,7 +3,9 @@
# NOTE(elemoine): keepalived cannot be configured to change the log address to
# anything other than /dev/log. Heka's log socket is at /var/lib/kolla/heka/log
# so we symlink /dev/log to that location.
-ln -sf /var/lib/kolla/heka/log /dev/log
+if [[ ! -h /dev/log ]]; then
+ ln -sf /var/lib/kolla/heka/log /dev/log
+fi
modprobe ip_vs