From 049e54b6f8135ebad2c735084b6dedd6952e5a3a Mon Sep 17 00:00:00 2001
From: karmab <karimboumedhel@gmail.com>
Date: Sun, 11 Aug 2024 16:00:52 +0200
Subject: [PATCH] openshift app: use odf_nodes or localstorage_nodes in storage
 apps

---
 .../openshift/apps/local-storage-operator/cr.yml   | 10 +++++++---
 kvirt/cluster/openshift/apps/odf-operator/pre.sh   | 14 +++++++++-----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/kvirt/cluster/openshift/apps/local-storage-operator/cr.yml b/kvirt/cluster/openshift/apps/local-storage-operator/cr.yml
index 3403d9bc1..ea032e497 100644
--- a/kvirt/cluster/openshift/apps/local-storage-operator/cr.yml
+++ b/kvirt/cluster/openshift/apps/local-storage-operator/cr.yml
@@ -10,10 +10,14 @@ spec:
         - key: kubernetes.io/hostname
           operator: In
           values:
-{% if not localstorage_nodes %}
-{% set localstorage_nodes = 99|defaultnodes(cluster, domain, ctlplanes,workers) %}
+{% if localstorage_nodes %}
+{% set nodes = localstorage_nodes %}
+{% elif odf_nodes is defined %}
+{% set nodes = odf_nodes %}
+{% else %}
+{% set nodes = 99|defaultnodes(cluster, domain, ctlplanes,workers) %}
 {% endif %}
-{% for node in localstorage_nodes %}
+{% for node in nodes %}
           - {{ node }}
 {% endfor %}
   storageClassDevices:
diff --git a/kvirt/cluster/openshift/apps/odf-operator/pre.sh b/kvirt/cluster/openshift/apps/odf-operator/pre.sh
index b6f17a4f4..148b99bee 100644
--- a/kvirt/cluster/openshift/apps/odf-operator/pre.sh
+++ b/kvirt/cluster/openshift/apps/odf-operator/pre.sh
@@ -1,21 +1,25 @@
 {{ "storagecluster" | wait_crd }}
 sleep 10
-{% if not odf_nodes %}
-{% set odf_nodes = odf_replicas|defaultnodes(cluster, domain, ctlplanes, workers) %}
+{% if odf_nodes %}
+{% set nodes = odf_nodes %}
+{% elif localstorage_nodes is defined %}
+{% set nodes = localstorage_nodes %}
+{% else %}
+{% set nodes = odf_replicas|defaultnodes(cluster, domain, ctlplanes, workers) %}
 {% endif %}
 
-{% if odf_nodes|length < odf_replicas %}
+{% if nodes|length < odf_replicas %}
 echo "Number of available nodes is lower than expected number of replicas"
 exit 1
 {% endif %}
 
-{% if odf_nodes|has_ctlplane %}
+{% if nodes|has_ctlplane %}
 echo "Marking all ctlplane nodes as schedulable since one of them will be used for storage"
 oc patch scheduler cluster -p '{"spec":{"mastersSchedulable": true}}' --type merge
 {% endif %}
 
 
-{% for node in odf_nodes %}
+{% for node in nodes %}
 oc label node {{ node }} cluster.ocs.openshift.io/openshift-storage=''
 oc label node {{ node }} topology.rook.io/rack=rack{{ loop.index }}
 {% endfor %}