openstack/openstack-ansible
Code Issues Proposed changes

Reference keepalived scripts through integrated repo path

Browse Source 
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
This commit is contained in:
Dmitriy Rabotyagov 2024-10-15 19:35:22 +02:00
parent aecaefa159
commit 80e6a1a443
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
inventory/group_vars/haproxy/keepalived.yml
View File

@ -31,11 +31,11 @@ keepalived_scripts:
##if a src_check_script is defined, it will be uploaded from src_check_script ##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 ##on the deploy host to the check_script location. If the check_script needs
##parameters, you can define the location under dest_check_script. ##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: pingable_check_script_external:
check_script: "/etc/keepalived/pingable_check.sh {{ keepalived_ping_count }} {{ keepalived_external_ping_address }}" check_script: "/etc/keepalived/pingable_check.sh {{ keepalived_ping_count }} {{ keepalived_external_ping_address }}"
dest_check_script: "/etc/keepalived/pingable_check.sh" 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 }}" interval: "{{ keepalived_ping_interval }}"
instance: external instance: external
weight: -101 weight: -101
@ -44,7 +44,7 @@ keepalived_scripts:
pingable_check_script_internal: pingable_check_script_internal:
check_script: "/etc/keepalived/pingable_check.sh {{ keepalived_ping_count }} {{ keepalived_internal_ping_address }}" check_script: "/etc/keepalived/pingable_check.sh {{ keepalived_ping_count }} {{ keepalived_internal_ping_address }}"
dest_check_script: "/etc/keepalived/pingable_check.sh" 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 }}" interval: "{{ keepalived_ping_interval }}"
instance: internal instance: internal
weight: -101 weight: -101