diff --git a/.gitignore b/.gitignore index 1e8b17188..66c9b4867 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ .vagrant *.retry inventory/vagrant_ansible_inventory -inventory/credentials/ inventory/group_vars/fake_hosts.yml inventory/host_vars/ temp diff --git a/roles/kubernetes/preinstall/tasks/main.yml b/roles/kubernetes/preinstall/tasks/main.yml index 34ad9af34..289065c71 100644 --- a/roles/kubernetes/preinstall/tasks/main.yml +++ b/roles/kubernetes/preinstall/tasks/main.yml @@ -3,11 +3,6 @@ tags: - asserts -# This is run before bin_dir is pinned because these tasks are run on localhost -- import_tasks: pre_upgrade.yml - tags: - - upgrade - - name: Force binaries directory for Container Linux by CoreOS set_fact: bin_dir: "/opt/bin" diff --git a/roles/kubernetes/preinstall/tasks/pre_upgrade.yml b/roles/kubernetes/preinstall/tasks/pre_upgrade.yml deleted file mode 100644 index 91bab1f52..000000000 --- a/roles/kubernetes/preinstall/tasks/pre_upgrade.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -- name: "Pre-upgrade | check if old credential dir exists" - local_action: - module: stat - path: "{{ inventory_dir }}/../credentials" - register: old_credential_dir - become: no - -- name: "Pre-upgrade | check if new credential dir exists" - local_action: - module: stat - path: "{{ inventory_dir }}/credentials" - register: new_credential_dir - become: no - when: old_credential_dir.stat.exists - -- name: "Pre-upgrade | move data from old credential dir to new" - local_action: command mv {{ inventory_dir }}/../credentials {{ inventory_dir }}/credentials - args: - creates: "{{ inventory_dir }}/credentials" - become: no - when: old_credential_dir.stat.exists and not new_credential_dir.stat.exists