From 8aafa7c41c31f7221dcc75967c73416aa2789e83 Mon Sep 17 00:00:00 2001
From: entlein <einentlein@gmail.com>
Date: Thu, 30 Jun 2022 18:04:15 +0200
Subject: [PATCH] not using the restart handler, maybe it is the reason it
consistently breaks
---
roles/rke2/tasks/config_rke2.yml | 13 +++++++++++--
roles/rke2/tasks/fix_selinux.yml | 17 ++++++++---------
roles/rke2/tasks/registries.yml | 4 ++--
3 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/roles/rke2/tasks/config_rke2.yml b/roles/rke2/tasks/config_rke2.yml
index 18040a8..76944ce 100644
--- a/roles/rke2/tasks/config_rke2.yml
+++ b/roles/rke2/tasks/config_rke2.yml
@@ -33,11 +33,20 @@
template:
src: config.yaml.j2
dest: /etc/rancher/rke2/config.yaml
- notify:
- - restart rke2
+ # notify:
+ # - restart rke2
- name: enable rke2
ansible.builtin.systemd:
name: "rke2-{{ node_type }}"
enabled: yes
masked: no
+
+- name: restart rke2
+ throttle: 1
+ ansible.builtin.systemd:
+ name: "rke2-{{ node_type }}"
+ masked: no
+ enabled: yes
+ state: restarted
+ daemon_reload: yes
\ No newline at end of file
diff --git a/roles/rke2/tasks/fix_selinux.yml b/roles/rke2/tasks/fix_selinux.yml
index af34d12..a983f92 100644
--- a/roles/rke2/tasks/fix_selinux.yml
+++ b/roles/rke2/tasks/fix_selinux.yml
@@ -12,10 +12,10 @@
# when: ( 'master' in group_names )
# ignore_errors: True
-- name: Sleep for another 30 seconds so that the OS-CCM has had time to boot up
- ansible.builtin.wait_for:
- timeout: 30
- delegate_to: localhost
+# - name: Sleep for another 30 seconds so that the OS-CCM has had time to boot up
+# ansible.builtin.wait_for:
+# timeout: 30
+# delegate_to: localhost
# - name: Wait for all control-plane pods to become created
@@ -39,8 +39,7 @@
# when: ('master' in group_names)
# ignore_errors: True
-
-# - name: Enable SELinux
-# selinux:
-# policy: targeted
-# state: enforcing
\ No newline at end of file
+- name: Enable SELinux
+ selinux:
+ policy: targeted
+ state: enforcing
\ No newline at end of file
diff --git a/roles/rke2/tasks/registries.yml b/roles/rke2/tasks/registries.yml
index 2341f70..d9b8601 100644
--- a/roles/rke2/tasks/registries.yml
+++ b/roles/rke2/tasks/registries.yml
@@ -2,6 +2,6 @@
template:
src: 'registry_mirrors.j2'
dest: '/etc/rancher/rke2/registries.yaml'
- notify:
- - restart rke2
+ # notify:
+ # - restart rke2
when: registry_mirrors is defined and registry_mirrors | length > 0
\ No newline at end of file
--
GitLab