diff options
| -rw-r--r-- | playbooks/adhoc/uninstall.yml | 4 | ||||
| -rw-r--r-- | roles/etcd_ca/tasks/main.yml | 15 | ||||
| -rw-r--r-- | roles/openshift_manageiq/tasks/main.yaml | 4 |
3 files changed, 17 insertions, 6 deletions
diff --git a/playbooks/adhoc/uninstall.yml b/playbooks/adhoc/uninstall.yml index ae4316f86..30e0f05fd 100644 --- a/playbooks/adhoc/uninstall.yml +++ b/playbooks/adhoc/uninstall.yml @@ -346,8 +346,12 @@ - /etc/etcd - /etc/systemd/system/etcd_container.service + # Intenationally using rm command over file module because if someone had mounted a filesystem + # at /var/lib/etcd then the contents was not removed correctly - name: Remove etcd data shell: rm -rf /var/lib/etcd/* + args: + warn: no failed_when: false - hosts: lb diff --git a/roles/etcd_ca/tasks/main.yml b/roles/etcd_ca/tasks/main.yml index 865074e41..4e68bc962 100644 --- a/roles/etcd_ca/tasks/main.yml +++ b/roles/etcd_ca/tasks/main.yml @@ -38,9 +38,18 @@ delegate_to: "{{ etcd_ca_host }}" run_once: true -- command: touch {{ etcd_ca_db }} - args: - creates: "{{ etcd_ca_db }}" +- name: Check etcd_ca_db exist + stat: path="{{ etcd_ca_db }}" + register: etcd_ca_db_check + changed_when: false + delegate_to: "{{ etcd_ca_host }}" + run_once: true + +- name: Touch etcd_ca_db file + file: + path: "{{ etcd_ca_db }}" + state: touch + when: etcd_ca_db_check.stat.isreg is not defined delegate_to: "{{ etcd_ca_host }}" run_once: true diff --git a/roles/openshift_manageiq/tasks/main.yaml b/roles/openshift_manageiq/tasks/main.yaml index de0a7000e..5d7a3c038 100644 --- a/roles/openshift_manageiq/tasks/main.yaml +++ b/roles/openshift_manageiq/tasks/main.yaml @@ -70,6 +70,4 @@ when: openshift.common.version_gte_3_2_or_1_2 | bool - name: Clean temporary configuration file - command: > - rm -f {{manage_iq_tmp_conf}} - changed_when: false + file: path={{manage_iq_tmp_conf}} state=absent |