Fix linting issues for ansible-lint 3.4.1

Preparing this role for the ansible-lint version bump

Change-Id: I6b34d38fad6096ac7f16076cbf1fda5da4b295d3
This commit is contained in:
Logan V 2016-11-01 15:41:58 -05:00
parent d3a2adc67c
commit 3db04e9497
2 changed files with 11 additions and 9 deletions

View File

@ -65,7 +65,8 @@
- name: pip cache install files locally
local_action: >
shell python /tmp/get-pip.py -d '{{ pip_tmp_packages | quote }}' {{ pip_get_pip_options }} {{ pip_packages | map('quote') | join (' ') }}
command python /tmp/get-pip.py -d '{{ pip_tmp_packages | quote }}' {{ pip_get_pip_options }} {{ pip_packages | map('quote') | join (' ') }}
changed_when: false
register: pip_local_cache
until: pip_local_cache | success
retries: 3

View File

@ -14,20 +14,21 @@
# limitations under the License.
- name: Install PIP
shell: |
python /opt/get-pip.py {{ pip_source_install_options }} \
{{ pip_get_pip_options }} \
command: >
python /opt/get-pip.py {{ pip_source_install_options }}
{{ pip_get_pip_options }}
{{ pip_packages | map('quote') | join (' ') }}
failed_when: false
changed_when: false
register: pip_install
until: pip_install | success
retries: 3
delay: 2
- name: Install PIP (fall back mode)
shell: |
python /opt/get-pip.py --isolated {{ pip_source_install_options }} \
{{ pip_get_pip_options }} \
command: >
python /opt/get-pip.py --isolated {{ pip_source_install_options }}
{{ pip_get_pip_options }}
{{ pip_packages | map('quote') | join (' ') }}
when: pip_install.rc != 0
register: pip_install_fall_back
@ -38,7 +39,7 @@
- name: Install pip packages
pip:
name: "{{ pip_required_pip_packages | map('quote') | join(' ') }}"
state: latest
state: "{{ pip_install_package_state }}"
extra_args: >-
{{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
{{ pip_install_options }}
@ -51,7 +52,7 @@
- name: Install pip packages (fall back mode)
pip:
name: "{{ pip_required_pip_packages | map('quote') | join(' ') }}"
state: latest
state: "{{ pip_install_package_state }}"
extra_args: >-
--isolated
{{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}