From 80e6a1a4433d0db889a108f437fb9ed62105acb0 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Tue, 15 Oct 2024 19:35:22 +0200 Subject: [PATCH] Reference keepalived scripts through integrated repo path At the moment we try to detect keepalived check locations through `playbook_dir` variable. As playbooks moved to plugins, this approach is not valid anymore. More robust approach would be to reffer through `openstack_clone_root`. Change-Id: I13bbb3e8f4fd7a45b500e5b5efb49e715985347d --- inventory/group_vars/haproxy/keepalived.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/inventory/group_vars/haproxy/keepalived.yml b/inventory/group_vars/haproxy/keepalived.yml index 5c61467587..6b135a984e 100644 --- a/inventory/group_vars/haproxy/keepalived.yml +++ b/inventory/group_vars/haproxy/keepalived.yml @@ -31,11 +31,11 @@ keepalived_scripts: ##if a src_check_script is defined, it will be uploaded from src_check_script ##on the deploy host to the check_script location. If the check_script needs ##parameters, you can define the location under dest_check_script. - src_check_script: "{{ playbook_dir }}/../scripts/keepalived_haproxy_check.sh" + src_check_script: "{{ openstack_clone_root }}/scripts/keepalived_haproxy_check.sh" pingable_check_script_external: check_script: "/etc/keepalived/pingable_check.sh {{ keepalived_ping_count }} {{ keepalived_external_ping_address }}" dest_check_script: "/etc/keepalived/pingable_check.sh" - src_check_script: "{{ playbook_dir }}/../scripts/keepalived_pingable_check.sh" + src_check_script: "{{ openstack_clone_root }}/scripts/keepalived_pingable_check.sh" interval: "{{ keepalived_ping_interval }}" instance: external weight: -101 @@ -44,7 +44,7 @@ keepalived_scripts: pingable_check_script_internal: check_script: "/etc/keepalived/pingable_check.sh {{ keepalived_ping_count }} {{ keepalived_internal_ping_address }}" dest_check_script: "/etc/keepalived/pingable_check.sh" - src_check_script: "{{ playbook_dir }}/../scripts/keepalived_pingable_check.sh" + src_check_script: "{{ openstack_clone_root }}/scripts/keepalived_pingable_check.sh" interval: "{{ keepalived_ping_interval }}" instance: internal weight: -101