diff options
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_hosted/tasks/storage/glusterfs.yml | 11 | ||||
| -rw-r--r-- | roles/openshift_prometheus/tasks/main.yaml | 4 |
2 files changed, 4 insertions, 11 deletions
diff --git a/roles/openshift_hosted/tasks/storage/glusterfs.yml b/roles/openshift_hosted/tasks/storage/glusterfs.yml index c2954fde1..9b998142a 100644 --- a/roles/openshift_hosted/tasks/storage/glusterfs.yml +++ b/roles/openshift_hosted/tasks/storage/glusterfs.yml @@ -79,14 +79,7 @@ - REGISTRY_STORAGE_MAINTENANCE_READONLY_ENABLED: 'true' when: openshift.hosted.registry.storage.glusterfs.swap -- name: Unmount registry volume +- name: Unmount registry volume and clean up mount point/fstab mount: - state: unmounted - name: "{{ mktemp.stdout }}" - -- name: Delete temp mount directory - file: - dest: "{{ mktemp.stdout }}" state: absent - changed_when: False - check_mode: no + name: "{{ mktemp.stdout }}" diff --git a/roles/openshift_prometheus/tasks/main.yaml b/roles/openshift_prometheus/tasks/main.yaml index a62babaa7..38798e1f5 100644 --- a/roles/openshift_prometheus/tasks/main.yaml +++ b/roles/openshift_prometheus/tasks/main.yaml @@ -20,10 +20,10 @@ mode: 0755 changed_when: False -- include: install_prometheus.yaml +- include_tasks: install_prometheus.yaml when: openshift_prometheus_state == 'present' -- include: uninstall_prometheus.yaml +- include_tasks: uninstall_prometheus.yaml when: openshift_prometheus_state == 'absent' - name: Delete temp directory |