Move included vars to vars section

Resolve [DEPRECATION WARNING]: Specifying include variables at the
top-level of the task is deprecated.

Change-Id: If9705961f7f699434d7da875cbad307fbfa618f8
This commit is contained in:
Jimmy McCrory 2017-04-12 12:53:06 -07:00
parent a72804ac8d
commit e7263ad7f3

View File

@ -78,7 +78,8 @@
- { key: "net.ipv4.ip_local_reserved_ports", value: "{{ keystone_admin_port }}"} - { key: "net.ipv4.ip_local_reserved_ports", value: "{{ keystone_admin_port }}"}
when: is_metal | bool when: is_metal | bool
- include: common-tasks/haproxy-endpoint-manage.yml - include: common-tasks/haproxy-endpoint-manage.yml
haproxy_state: disabled vars:
haproxy_state: disabled
when: "{{ groups['keystone_all'] | length > 1 }}" when: "{{ groups['keystone_all'] | length > 1 }}"
roles: roles:
- role: "os_keystone" - role: "os_keystone"
@ -96,7 +97,8 @@
- crontab - crontab
post_tasks: post_tasks:
- include: common-tasks/haproxy-endpoint-manage.yml - include: common-tasks/haproxy-endpoint-manage.yml
haproxy_state: enabled vars:
haproxy_state: enabled
when: "{{ groups['keystone_all'] | length > 1 }}" when: "{{ groups['keystone_all'] | length > 1 }}"
vars: vars:
is_metal: "{{ properties.is_metal|default(false) }}" is_metal: "{{ properties.is_metal|default(false) }}"