Merge "Set default keepalived cidr if none is provided"

This commit is contained in:
Jenkins 2016-10-12 15:00:59 +00:00 committed by Gerrit Code Review
commit b92c7971bc
2 changed files with 11 additions and 2 deletions

View File

@ -51,7 +51,7 @@ keepalived_instances:
priority: "{{ ((play_hosts|length-play_hosts.index(inventory_hostname))*100)-((play_hosts|length-play_hosts.index(inventory_hostname))*50) }}"
authentication_password: "{{ haproxy_keepalived_authentication_password }}"
vips:
- "{{ haproxy_keepalived_external_vip_cidr }} dev {{ haproxy_keepalived_external_interface | default(management_bridge) }}"
- "{{ haproxy_keepalived_external_vip_cidr | default('169.254.1.1/24') }} dev {{ haproxy_keepalived_external_interface | default(management_bridge) }}"
track_scripts:
- haproxy_check_script
- pingable_check_script
@ -65,4 +65,4 @@ keepalived_instances:
- haproxy_check_script
- pingable_check_script
vips:
- "{{ haproxy_keepalived_internal_vip_cidr }} dev {{ haproxy_keepalived_internal_interface | default(management_bridge) }}"
- "{{ haproxy_keepalived_internal_vip_cidr | default('169.254.2.1/24') }} dev {{ haproxy_keepalived_internal_interface | default(management_bridge) }}"

View File

@ -0,0 +1,9 @@
---
issues:
- The variables
``haproxy_keepalived_(internal|external)_cidr`` now has a default
set to ``169.254.(2|1).1/24``. This is to prevent Ansible
undefined variable warnings.
Deployers must set values for these variables for a working
haproxy with keepalived environment when using more than one
haproxy node.