openstack
/
openstack-ansible
Code Issues Proposed changes

Merge "Fix keys() method output"

This commit is contained in:
Zuul 2020-09-09 09:30:17 +00:00 committed by Gerrit Code Review
parent f16f1f617d 9f893c207a
commit 908d10a4a3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,13 +62,13 @@ keepalived_instances:
authentication_password: "{{ haproxy_keepalived_authentication_password }}"
vips:
- "{{ haproxy_keepalived_external_vip_cidr | default('169.254.1.1/24') }} dev {{ haproxy_keepalived_external_interface | default(management_bridge) }}"
track_scripts: "{{ keepalived_scripts.keys() }}"
track_scripts: "{{ keepalived_scripts.keys() | list }}"
internal:
interface: "{{ haproxy_keepalived_internal_interface | default(management_bridge) }}"
state: "{{ (groups['haproxy'].index(inventory_hostname) == 0) | ternary('MASTER', 'BACKUP') }}"
virtual_router_id: "{{ haproxy_keepalived_internal_virtual_router_id | default ('11') }}"
priority: "{{ (groups['haproxy']|length-groups['haproxy'].index(inventory_hostname))*50 }}"
authentication_password: "{{ haproxy_keepalived_authentication_password }}"
track_scripts: "{{ keepalived_scripts.keys() }}"
track_scripts: "{{ keepalived_scripts.keys() | list }}"
vips:
- "{{ haproxy_keepalived_internal_vip_cidr | default('169.254.2.1/24') }} dev {{ haproxy_keepalived_internal_interface | default(management_bridge) }}"

2
inventory/group_vars/manila_all.yml
View File

@ -18,7 +18,7 @@ manila_enabled_share_protocols:
- NFS
- CEPHFS
_manila_default_share_type: "{{ (manila_backends | default({})).keys() }}"
_manila_default_share_type: "{{ (manila_backends | default({})).keys() | list }}"
manila_default_share_type: "{{ ((_manila_default_share_type | length) > 0) | ternary(_manila_default_share_type[0], null) }}"
# manila_backend_lvm_inuse: True if current host has an lvm backend