From aabb0efdf11f3c615daa21506acfec0f3a98abc9 Mon Sep 17 00:00:00 2001
From: entlein <einentlein@gmail.com>
Date: Mon, 18 Jul 2022 15:11:23 +0200
Subject: [PATCH] only restart the CCM when it s the initial installation

---
 roles/rke2/tasks/fix_selinux.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/roles/rke2/tasks/fix_selinux.yml b/roles/rke2/tasks/fix_selinux.yml
index 8b2ba35..5dc3e1b 100644
--- a/roles/rke2/tasks/fix_selinux.yml
+++ b/roles/rke2/tasks/fix_selinux.yml
@@ -9,13 +9,14 @@
 - name: kill the openstack ccm pods to make sure they boot in permissive mode
   shell: "/var/lib/rancher/rke2/bin/kubectl --kubeconfig /etc/rancher/rke2/rke2.yaml rollout restart -n kube-system ds openstack-cloud-controller-manager "
   register: openstack_ccm_ready
-  when: ( 'master' in group_names )
+  when: ( 'master' in group_names and not upgrade)
   ignore_errors: True
 
 
 - name: Wait for openstack-cloud-controller deamon set to be ready
   shell: "/var/lib/rancher/rke2/bin/kubectl --kubeconfig /etc/rancher/rke2/rke2.yaml wait --namespace=kube-system --for=condition=Ready ds openstack-cloud-controller-manager --timeout=120s"
   register: openstack_ccm_ready
+  when: not upgrade
   ignore_errors: True
 
 - name: Enable SELinux
-- 
GitLab