From acd5185ad4cb5d2882863b164a1a7088e3384c47 Mon Sep 17 00:00:00 2001 From: Cristian Calin <6627509+cristicalin@users.noreply.github.com> Date: Fri, 19 Nov 2021 02:46:51 +0200 Subject: [PATCH] Fix fedora reset (#8205) * Reset: Fedora uses NetworkManager * CI: test reset on fedora --- .gitlab-ci/packet.yml | 2 ++ roles/reset/tasks/main.yml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml index 90a3ad3978f..58204c70336 100644 --- a/.gitlab-ci/packet.yml +++ b/.gitlab-ci/packet.yml @@ -202,6 +202,8 @@ packet_fedora33-calico: stage: deploy-part2 extends: .packet_periodic when: on_success + variables: + RESET_CHECK: "true" packet_fedora34-calico-selinux: stage: deploy-part2 diff --git a/roles/reset/tasks/main.yml b/roles/reset/tasks/main.yml index 101be1c8884..1ff9296fccb 100644 --- a/roles/reset/tasks/main.yml +++ b/roles/reset/tasks/main.yml @@ -385,7 +385,7 @@ service: name: >- {% if ansible_os_family == "RedHat" -%} - {%- if ansible_distribution_major_version|int == 8 or is_fedora_coreos -%} + {%- if ansible_distribution_major_version|int == 8 or is_fedora_coreos or ansible_distribution == "Fedora" -%} NetworkManager {%- else -%} network