aboutsummaryrefslogtreecommitdiff
path: root/docker/keepalived
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-09-25 13:50:16 +0000
committerGerrit Code Review <review@openstack.org>2015-09-25 13:50:16 +0000
commit00f35e55907d54bacd291ebaab684d7b26420c37 (patch)
tree16007cefaaf79415d97cb6493cfd30581a9a7b99 /docker/keepalived
parent0f297ed0ee9e9a2eedf8c846e200321fd0070072 (diff)
parent89ecfc164ed92696de4c5cd2c0f90f23c1ad3784 (diff)
downloadkolla-00f35e55907d54bacd291ebaab684d7b26420c37.tar.gz
kolla-00f35e55907d54bacd291ebaab684d7b26420c37.zip
Merge "Replace config-external - haproxy keepalived"
Diffstat (limited to 'docker/keepalived')
-rwxr-xr-xdocker/keepalived/start.sh10
1 files changed, 4 insertions, 6 deletions
diff --git a/docker/keepalived/start.sh b/docker/keepalived/start.sh
index a122526e4..8c41a5f7d 100755
--- a/docker/keepalived/start.sh
+++ b/docker/keepalived/start.sh
@@ -1,14 +1,12 @@
#!/bin/bash
set -o errexit
-CMD="/usr/sbin/keepalived"
-ARGS="-nld -p /run/keepalived.pid"
-
# Loading common functions.
source /opt/kolla/kolla-common.sh
-# Execute config strategy
-set_configs
+# Generate run command
+python /opt/kolla/set_configs.py
+CMD=$(cat /run_command)
modprobe ip_vs
@@ -17,4 +15,4 @@ if [ -f /run/keepalived.pid ]; then
rm /run/keepalived.pid
fi
-exec $CMD $ARGS
+exec $CMD