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

This commit is contained in:
Jenkins
2016-04-21 07:29:53 +00:00
committed by Gerrit Code Review
3 changed files with 5 additions and 7 deletions
+1 -1
View File
@@ -47,6 +47,6 @@
name: "{{ item }}"
state: "restarted"
pattern: "{{ item }}"
with_items: designate_service_names
with_items: "{{ designate_service_names }}"
failed_when: false
+3 -5
View File
@@ -73,8 +73,7 @@
until: install_packages|success
retries: 5
delay: 2
with_items:
- "{{ designate_requires_pip_packages }}"
with_items: "{{ designate_requires_pip_packages }}"
tags:
- designate-install
- designate-pip-packages
@@ -192,7 +191,7 @@
until: install_packages|success
retries: 5
delay: 2
with_items: designate_pip_packages
with_items: "{{ designate_pip_packages }}"
when:
- designate_venv_enabled | bool
- designate_get_venv | failed or designate_developer_mode | bool
@@ -212,8 +211,7 @@
until: install_packages|success
retries: 5
delay: 2
with_items:
- "{{ designate_pip_packages }}"
with_items: "{{ designate_pip_packages }}"
when:
- not designate_venv_enabled | bool
- not designate_developer_mode | bool
+1 -1
View File
@@ -33,4 +33,4 @@
until: install_packages|success
retries: 5
delay: 2
with_items: designate_apt_packages
with_items: "{{ designate_apt_packages }}"