Ansible 2.x - Address deprecation warning of bare variables

Ansible 2.2 will not allow "bare" variable references
in with_* loops. See https://docs.ansible.com/ansible/porting_guide_2.0.html#deprecated
for details.

Change-Id: I285f6e906fcbf9450d33e352fc1217188978c0bf
This commit is contained in:
Travis Truman 2016-04-22 11:48:50 -04:00
parent 608734985a
commit 61e619291c
4 changed files with 11 additions and 11 deletions

View File

@ -18,6 +18,6 @@
name: "{{ item.value.service_name }}" name: "{{ item.value.service_name }}"
state: restarted state: restarted
pattern: "{{ item.value.service_name }}" pattern: "{{ item.value.service_name }}"
with_dict: neutron_services with_dict: "{{ neutron_services }}"
failed_when: false failed_when: false
when: item.value.service_en | bool when: item.value.service_en | bool

View File

@ -78,7 +78,7 @@
state: stopped state: stopped
pattern: "neutron-server" pattern: "neutron-server"
delegate_to: "{{ item }}" delegate_to: "{{ item }}"
with_items: groups[neutron_services['neutron-server']['group']] with_items: "{{ groups[neutron_services['neutron-server']['group']] }}"
when: (neutron_migrations is defined and neutron_migrations['run_contract']|bool) or neutron_plugin_type != 'ml2' when: (neutron_migrations is defined and neutron_migrations['run_contract']|bool) or neutron_plugin_type != 'ml2'
tags: tags:
- neutron-db-setup - neutron-db-setup
@ -122,7 +122,7 @@
state: started state: started
pattern: "neutron-server" pattern: "neutron-server"
delegate_to: "{{ item }}" delegate_to: "{{ item }}"
with_items: groups[neutron_services['neutron-server']['group']] with_items: "{{ groups[neutron_services['neutron-server']['group']] }}"
when: (neutron_migrations is defined and neutron_migrations['run_contract']|bool) or neutron_plugin_type != 'ml2' when: (neutron_migrations is defined and neutron_migrations['run_contract']|bool) or neutron_plugin_type != 'ml2'
tags: tags:
- neutron-db-setup - neutron-db-setup

View File

@ -38,7 +38,7 @@
until: install_packages|success until: install_packages|success
retries: 5 retries: 5
delay: 2 delay: 2
with_items: neutron_apt_packages with_items: "{{ neutron_apt_packages }}"
tags: tags:
- neutron-install - neutron-install
- neutron-apt-packages - neutron-apt-packages
@ -51,7 +51,7 @@
until: install_packages|success until: install_packages|success
retries: 5 retries: 5
delay: 2 delay: 2
with_items: neutron_lbaas_apt_packages with_items: "{{ neutron_lbaas_apt_packages }}"
when: when:
- inventory_hostname in groups[neutron_services['neutron-lbaas-agent']['group']] - inventory_hostname in groups[neutron_services['neutron-lbaas-agent']['group']]
- neutron_lbaas | bool or neutron_lbaasv2 | bool - neutron_lbaas | bool or neutron_lbaasv2 | bool
@ -67,7 +67,7 @@
until: install_packages|success until: install_packages|success
retries: 5 retries: 5
delay: 2 delay: 2
with_items: neutron_vpnaas_apt_packages with_items: "{{ neutron_vpnaas_apt_packages }}"
when: when:
- inventory_hostname in groups[neutron_services['neutron-vpnaas-agent']['group']] - inventory_hostname in groups[neutron_services['neutron-vpnaas-agent']['group']]
- neutron_vpnaas | bool - neutron_vpnaas | bool
@ -83,7 +83,7 @@
until: remove_packages|success until: remove_packages|success
retries: 5 retries: 5
delay: 2 delay: 2
with_items: neutron_apt_remove_packages with_items: "{{ neutron_apt_remove_packages }}"
tags: tags:
- neutron-install - neutron-install
- neutron-apt-packages - neutron-apt-packages
@ -258,7 +258,7 @@
until: install_packages|success until: install_packages|success
retries: 5 retries: 5
delay: 2 delay: 2
with_items: neutron_pip_packages with_items: "{{ neutron_pip_packages }}"
when: when:
- neutron_venv_enabled | bool - neutron_venv_enabled | bool
- neutron_get_venv | failed or neutron_developer_mode | bool - neutron_get_venv | failed or neutron_developer_mode | bool
@ -276,7 +276,7 @@
until: install_packages|success until: install_packages|success
retries: 5 retries: 5
delay: 2 delay: 2
with_items: neutron_pip_packages with_items: "{{ neutron_pip_packages }}"
when: when:
- not neutron_developer_mode | bool - not neutron_developer_mode | bool
- not neutron_venv_enabled | bool - not neutron_venv_enabled | bool

View File

@ -75,7 +75,7 @@
mode: "0644" mode: "0644"
config_overrides: "{{ item.value.config_overrides }}" config_overrides: "{{ item.value.config_overrides }}"
config_type: "{{ item.value.config_type }}" config_type: "{{ item.value.config_type }}"
with_dict: neutron_services with_dict: "{{ neutron_services }}"
notify: notify:
- Restart neutron services - Restart neutron services
when: when:
@ -112,7 +112,7 @@
dest: "/etc/neutron/{{ item.value.service_rootwrap }}" dest: "/etc/neutron/{{ item.value.service_rootwrap }}"
owner: "root" owner: "root"
group: "root" group: "root"
with_dict: neutron_services with_dict: "{{ neutron_services }}"
when: when:
- item.value.service_en | bool - item.value.service_en | bool
- item.value.service_rootwrap is defined - item.value.service_rootwrap is defined