From ded665be5bf74159b59ad72d3d89b29f0343326e Mon Sep 17 00:00:00 2001 From: Michal Opala Date: Thu, 3 Sep 2020 15:05:37 +0200 Subject: [PATCH] upgrade/k8s/load_balancer: adding legacy haproxy removal --- .../upgrade/tasks/kubernetes/upgrade-haproxy.yml | 11 ++++------- .../tasks/legacy-haproxy/Debian/uninstall-haproxy.yml | 6 ++++++ .../tasks/legacy-haproxy/RedHat/uninstall-haproxy.yml | 10 ++++++++++ .../playbooks/roles/upgrade/tasks/load_balancer.yml | 4 ++++ 4 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 core/src/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/legacy-haproxy/Debian/uninstall-haproxy.yml create mode 100644 core/src/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/legacy-haproxy/RedHat/uninstall-haproxy.yml diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/kubernetes/upgrade-haproxy.yml b/core/src/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/kubernetes/upgrade-haproxy.yml index 1eef147911..53cd7a5bce 100644 --- a/core/src/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/kubernetes/upgrade-haproxy.yml +++ b/core/src/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/kubernetes/upgrade-haproxy.yml @@ -12,16 +12,13 @@ service_facts: no_log: true - - name: k8s/haproxy | Stop and disable legacy haproxy.service - systemd: - name: haproxy.service - state: stopped - enabled: false + - name: k8s/haproxy | Remove legacy haproxy + include_tasks: + file: "legacy-haproxy/{{ ansible_os_family }}/uninstall-haproxy.yml" when: # After this upgrade it is completely possible to have load_balancer component deployed on any k8s master/node - - ansible_facts.services["haproxy-k8s.services"] is undefined + - ansible_facts.services["haproxy-k8s.service"] is undefined - ansible_facts.services["haproxy.service"] is defined - - ansible_facts.services["haproxy.service"].state == "running" - name: k8s/haproxy | Install haproxy-k8s service (runc) include_role: diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/legacy-haproxy/Debian/uninstall-haproxy.yml b/core/src/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/legacy-haproxy/Debian/uninstall-haproxy.yml new file mode 100644 index 0000000000..03b4375f93 --- /dev/null +++ b/core/src/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/legacy-haproxy/Debian/uninstall-haproxy.yml @@ -0,0 +1,6 @@ +--- +- name: haproxy/uninstall | Uninstall haproxy package + apt: + name: haproxy + update_cache: true + state: absent diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/legacy-haproxy/RedHat/uninstall-haproxy.yml b/core/src/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/legacy-haproxy/RedHat/uninstall-haproxy.yml new file mode 100644 index 0000000000..1a6849caa4 --- /dev/null +++ b/core/src/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/legacy-haproxy/RedHat/uninstall-haproxy.yml @@ -0,0 +1,10 @@ +--- +- name: haproxy/uninstall | Uninstall haproxy family packages + yum: + name: + - rh-haproxy18 + - rh-haproxy18-haproxy + - rh-haproxy18-haproxy-syspaths + - rh-haproxy18-runtime + update_cache: true + state: absent diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/load_balancer.yml b/core/src/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/load_balancer.yml index af2c192ec4..f9b4c9ce25 100644 --- a/core/src/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/load_balancer.yml +++ b/core/src/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/load_balancer.yml @@ -1,4 +1,8 @@ --- +- name: load_balancer | Remove legacy haproxy + include_tasks: + file: "legacy-haproxy/{{ ansible_os_family }}/uninstall-haproxy.yml" + - name: load_balancer | Upgrade haproxy service (runc) include_role: name: haproxy