Merge "Use file module instead of shell to remove roles"

This commit is contained in:
Zuul 2018-10-31 13:54:43 +00:00 committed by Gerrit Code Review
commit 0387e5a269
1 changed files with 4 additions and 6 deletions

View File

@ -19,14 +19,12 @@
user: root
tasks:
- name: Remove target directory if required
shell: |
if [[ ! -d "{{ item.path | default(role_path_default) }}/{{ item.name | default(item.src | basename) }}/.git" ]]; then
rm -rf "{{ item.path | default(role_path_default) }}/{{ item.name | default(item.src | basename) }}"
fi
args:
executable: /bin/bash
file:
path: "{{ item.path | default(role_path_default) }}/{{ item.name | default(item.src | basename) }}"
state: absent
when:
- item.scm == "git" or item.scm is undefined
- "(item.path | default(role_path_default) ~ '/' ~ item.name | default(item.src | basename) ~ '/.git') is not directory"
with_items: "{{ required_roles }}"
- name: Ensure the default roles directory exists