Merge "Ansible 2.x - Address deprecation warning of bare variables"

This commit is contained in:
Jenkins 2016-04-21 07:16:17 +00:00 committed by Gerrit Code Review
commit 71e4a79fc1

View File

@ -111,7 +111,7 @@
ifdown {{ item.value.interface }} ifdown {{ item.value.interface }}
ifup {{ item.value.interface }} ifup {{ item.value.interface }}
fi fi
with_dict: container_networks|default({}) with_dict: "{{ container_networks|default({}) }}"
delegate_to: "{{ physical_host }}" delegate_to: "{{ physical_host }}"
tags: tags:
- lxc-container-networks - lxc-container-networks
@ -123,7 +123,7 @@
owner: "root" owner: "root"
group: "root" group: "root"
mode: "0644" mode: "0644"
with_dict: container_networks|default({}) with_dict: "{{ container_networks|default({}) }}"
notify: notify:
- Lxc container restart - Lxc container restart
delegate_to: "{{ physical_host }}" delegate_to: "{{ physical_host }}"
@ -148,9 +148,9 @@
dest: "/var/lib/lxc/{{ inventory_hostname }}/config" dest: "/var/lib/lxc/{{ inventory_hostname }}/config"
line: "lxc.include = /var/lib/lxc/{{ inventory_hostname }}/{{ item.value.interface }}.ini" line: "lxc.include = /var/lib/lxc/{{ inventory_hostname }}/{{ item.value.interface }}.ini"
backup: "true" backup: "true"
with_dict: container_networks|default({}) with_dict: "{{ container_networks|default({}) }}"
when: > when:
item.value.interface is defined - item.value.interface is defined
notify: notify:
- Lxc container restart - Lxc container restart
delegate_to: "{{ physical_host }}" delegate_to: "{{ physical_host }}"
@ -211,7 +211,7 @@
if ! grep '{{ item.key }}={{ item.value }}' /etc/environment; then if ! grep '{{ item.key }}={{ item.value }}' /etc/environment; then
echo '{{ item.key }}={{ item.value }}' | tee -a /etc/environment echo '{{ item.key }}={{ item.value }}' | tee -a /etc/environment
fi fi
with_dict: global_environment_variables | default({}) with_dict: "{{ global_environment_variables | default({}) }}"
when: global_environment_variables is defined when: global_environment_variables is defined
delegate_to: "{{ physical_host }}" delegate_to: "{{ physical_host }}"
tags: tags: