commit f8b17b4fa350f40785d17c38f6848faa1057a4aa
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Nov 22 12:35:29 2018 +0000
committer Gerrit Code Review <mail@domain.com> Thu Nov 22 12:35:29 2018 +0000
tree 42a24255d296fff3b25b8d880d1256bd65eca178
parent 6e17f5c5a125de7ba65f438e21039fad7714112a
parent 54c9f7919c269d1713458fbccd83230d79138289

Merge "Enabling keepalived on proxy nodes"

defaults/init.yml

diff --git a/defaults/init.yml b/defaults/init.yml
index b19f2c8..dc5cc49 100644
--- a/defaults/init.yml
+++ b/defaults/init.yml
@@ -13,6 +13,7 @@
 - system.defaults.debmirror
 - system.defaults.docker_images
 - system.defaults.gerrit
+- system.defaults.keepalived
 parameters:
   _param:
     mcp_version: stable

defaults/keepalived/init.yml

diff --git a/defaults/keepalived/init.yml b/defaults/keepalived/init.yml
new file mode 100644
index 0000000..f39d80e
--- /dev/null
+++ b/defaults/keepalived/init.yml
@@ -0,0 +1,3 @@
+parameters:
+  _param:
+    keepalived_openstack_web_vrrp_script_check_pidof_args: "nginx"

keepalived/cluster/instance/openstack_web_public_vip.yml

diff --git a/keepalived/cluster/instance/openstack_web_public_vip.yml b/keepalived/cluster/instance/openstack_web_public_vip.yml
index 144ddf2..363f23b 100644
--- a/keepalived/cluster/instance/openstack_web_public_vip.yml
+++ b/keepalived/cluster/instance/openstack_web_public_vip.yml
@@ -11,7 +11,7 @@
     cluster:
       vrrp_scripts:
         check_pidof:
-          args: "nginx"
+          args: ${_param:keepalived_openstack_web_vrrp_script_check_pidof_args}
           interval: 10
           rise: 1
           fall: 1
@@ -23,4 +23,4 @@
           interface: ${_param:keepalived_openstack_web_public_vip_interface}
           virtual_router_id: 132
           priority: ${_param:keepalived_vip_priority}
-          track_script: check_pidof
\ No newline at end of file
+          track_script: check_pidof