Browse Source

Revert "Add pre-upgrade task for moving credentials file" (#2393)

pull/2396/head
Matthew Mosesohn 7 years ago
committed by GitHub
parent
commit
7ef9f4dfdd
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 28 deletions
  1. 1
      .gitignore
  2. 5
      roles/kubernetes/preinstall/tasks/main.yml
  3. 22
      roles/kubernetes/preinstall/tasks/pre_upgrade.yml

1
.gitignore

@ -1,7 +1,6 @@
.vagrant
*.retry
inventory/vagrant_ansible_inventory
inventory/credentials/
inventory/group_vars/fake_hosts.yml
inventory/host_vars/
temp

5
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"

22
roles/kubernetes/preinstall/tasks/pre_upgrade.yml

@ -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
Loading…
Cancel
Save