diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-09 15:52:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-09 15:52:32 +0000 |
| commit | 92033d0a531ed0dfadb39ab3eda100f3be16a5de (patch) | |
| tree | 0d77c6fb1ea371be1df91c9996f0fb1993c5abdb /docker | |
| parent | 241913cc8f0870b160c4cb1c3327022e0ad9dd4b (diff) | |
| parent | 500dc73c87f54052a7f632ecd5eeefa3a86f7f49 (diff) | |
| download | kolla-92033d0a531ed0dfadb39ab3eda100f3be16a5de.tar.gz kolla-92033d0a531ed0dfadb39ab3eda100f3be16a5de.zip | |
Merge "Do not create /dev/log symlink if it already exists"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/keepalived/extend_start.sh | 4 |
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 |