C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix fedora reset (#8205)

Browse source 
* Reset: Fedora uses NetworkManager

* CI: test reset on fedora
This commit is contained in:
Cristian Calin 2021-11-19 02:46:51 +02:00 committed by GitHub
parent 0263c649f4
commit acd5185ad4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci/packet.yml
View file

@ -202,6 +202,8 @@ packet_fedora33-calico:
stage: deploy-part2 stage: deploy-part2
extends: .packet_periodic extends: .packet_periodic
when: on_success when: on_success
variables:
RESET_CHECK: "true"
packet_fedora34-calico-selinux: packet_fedora34-calico-selinux:
stage: deploy-part2 stage: deploy-part2

2
roles/reset/tasks/main.yml
View file

@ -385,7 +385,7 @@
service: service:
name: >- name: >-
{% if ansible_os_family == "RedHat" -%} {% 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 NetworkManager
{%- else -%} {%- else -%}
network network