openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove ceph-ansible fetch directory after it is saved" into stable/stein

This commit is contained in:
Zuul 2019-04-29 22:16:14 +00:00 committed by Gerrit Code Review
parent 4895df507e cc25176887
commit ba30b70e68
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deployment/ceph-ansible/ceph-base.yaml
View File

@ -642,7 +642,6 @@ outputs:
dest: "{{local_ceph_ansible_fetch_directory_backup}}/{{ceph_ansible_tarball_name}}"
exclude_path:
- '{{playbook_dir}}/ceph-ansible/fetch_dir/fetch_dir'
register: nested
when:
- local_ceph_ansible_fetch_directory_backup != ""
- ceph_ansible_fetch_dir_contents.matched|int != 0
@ -653,7 +652,6 @@ outputs:
dest: "/tmp/{{new_ceph_ansible_tarball_name}}"
exclude_path:
- '{{playbook_dir}}/ceph-ansible/fetch_dir/fetch_dir'
register: nested
- name: backup temporary ceph-ansible fetch directory tarball in swift
shell: "curl -s -o /dev/null -w '%{http_code}' -X PUT -T /tmp/{{new_ceph_ansible_tarball_name}} \"{{ swift_put_url }}\""
register: curl_put_http_status
@ -673,14 +671,10 @@ outputs:
when:
- local_ceph_ansible_fetch_directory_backup == ""
- ceph_ansible_fetch_dir_contents.matched|int != 0
- name: remove nested broken path if exist
- name: Remove ceph-ansible fetch directory
file:
path: "{{playbook_dir}}/ceph-ansible/fetch_dir/"
state: absent
path: "{{ item }}"
recurse: no
with_items:
- '{{ nested.missing }}'
when: (nested.missing|default([])|length > 0)
external_update_tasks:
- when: step|int == 0
tags: ceph