aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-08-20 08:38:57 +0000
committerGerrit Code Review <review@openstack.org>2015-08-20 08:38:57 +0000
commit1b49b9572d06af6a19e4b9a3a9461c10366c7238 (patch)
tree630acf69663a6bc90850228d8521c711424a6a29
parent7541da8fc689c656aa2dc6394be7b36020bf5102 (diff)
parentc4611eca8e9f3fc4b57558e069c929cf5fbd868f (diff)
downloadkolla-1b49b9572d06af6a19e4b9a3a9461c10366c7238.tar.gz
kolla-1b49b9572d06af6a19e4b9a3a9461c10366c7238.zip
Merge "Load ip_vs module for keepalived"
-rwxr-xr-xansible/roles/haproxy/tasks/start.yml1
-rwxr-xr-xdocker/common/keepalived/start.sh2
2 files changed, 3 insertions, 0 deletions
diff --git a/ansible/roles/haproxy/tasks/start.yml b/ansible/roles/haproxy/tasks/start.yml
index caecacaf5..0feae4be6 100755
--- a/ansible/roles/haproxy/tasks/start.yml
+++ b/ansible/roles/haproxy/tasks/start.yml
@@ -17,6 +17,7 @@
volumes:
- "{{ node_config_directory }}/keepalived/:/opt/kolla/keepalived/:ro"
- "/run:/run"
+ - "/lib/modules:/lib/modules:ro"
env:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
diff --git a/docker/common/keepalived/start.sh b/docker/common/keepalived/start.sh
index 93eba4763..3c539d69d 100755
--- a/docker/common/keepalived/start.sh
+++ b/docker/common/keepalived/start.sh
@@ -10,4 +10,6 @@ source /opt/kolla/kolla-common.sh
# Execute config strategy
set_configs
+modprobe ip_vs
+
exec $CMD $ARGS