diff --git a/roles/etcd-restore/tasks/redhat/2-etcd-restore.yml b/roles/etcd-restore/tasks/redhat/2-etcd-restore.yml index ddd7179..283110a 100644 --- a/roles/etcd-restore/tasks/redhat/2-etcd-restore.yml +++ b/roles/etcd-restore/tasks/redhat/2-etcd-restore.yml @@ -16,10 +16,6 @@ cp -r /var/lib/etcd/* /tmp/etcd-backup-{{ time }} failed_when: false -#- name: "[{{ target }} / 2-etcd-restore.yml] etcd original file delete" -# shell: | -# rm -rf /var/lib/etcd/* - - name: "[{{ target }} / 2-etcd-restore.yml] find old etcd file and directory" find: path: /var/lib/etcd diff --git a/roles/etcd-restore/tasks/redhat/8-delete-all-pods.yml b/roles/etcd-restore/tasks/redhat/8-delete-all-pods.yml new file mode 100644 index 0000000..a16c376 --- /dev/null +++ b/roles/etcd-restore/tasks/redhat/8-delete-all-pods.yml @@ -0,0 +1,12 @@ +--- +- name: Sleep for 1 min + debug: + msg: + Sleep for 1 min + +- name: Sleep for 1 min done! + wait_for: + timeout: 60 + +- name: delete all pods + shell: kubectl delete pods -A --all --force --grace-period=0 \ No newline at end of file diff --git a/roles/etcd-restore/tasks/redhat/8-calico-restart.yml b/roles/etcd-restore/tasks/redhat/9-calico-restart.yml similarity index 100% rename from roles/etcd-restore/tasks/redhat/8-calico-restart.yml rename to roles/etcd-restore/tasks/redhat/9-calico-restart.yml diff --git a/roles/etcd-restore/tasks/redhat/main.yml b/roles/etcd-restore/tasks/redhat/main.yml index a804c7e..1db2dfa 100644 --- a/roles/etcd-restore/tasks/redhat/main.yml +++ b/roles/etcd-restore/tasks/redhat/main.yml @@ -37,4 +37,9 @@ - include: "7-kube-controller-manager-restart.yml" when: - ("host-master" in group_names or "host-master-cluster" in group_names) and target == "host" or - ("member-master" in group_names or "member-master-cluster" in group_names) and target == "member" \ No newline at end of file + ("member-master" in group_names or "member-master-cluster" in group_names) and target == "member" + +- include: "8-delete-all-pods.yml" + when: + - ("host-master" in group_names) and target == 'host' or + ("member-master" in group_names) and target == 'member' \ No newline at end of file