EX-6372 lipe: Remove colocation constraint from lamigo/lpurge resources

We now rely on node attribute *-recovered to start HP resources.
Hence, starting ES 5.2.7 colocation constraints are not needed
to start resources. Moreover, with the rules added, base FS
target resources cannot start on the designated nodes as node
get -inf score. This prevents resources failback in case original
server comes back up after failover.

Test-Parameters: trivial

Signed-off-by: Gaurang Tapase <gtapase@ddn.com>
Change-Id: I890b12bf8a0d75d618a041be1eb27960dc62cc7e
Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/49179
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Artur Novik <anovik@ddn.com>
Reviewed-by: Minh Diep <mdiep@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>

diff --git a/lipe/scripts/stratagem-hp-config.sh b/lipe/scripts/stratagem-hp-config.sh
index 92f91d7..ab95f89 100755 (executable)
--- a/lipe/scripts/stratagem-hp-config.sh
+++ b/lipe/scripts/stratagem-hp-config.sh
@@ -287,7 +287,6 @@ EOF
     echo Creating lpurge resource for $FS-OST$OST
     clush -qS --group=ha_heads "crm_resource -QW -r ost$INDEX-$FS >/dev/null 2>&1 && crm configure << EOF || true
 primitive lpurge-$FS-OST$OST systemd:lpurge@$FS-OST$OST.service op monitor interval=30s op start timeout=100s op stop timeout=100s
-colocation lpurge-$FS-$OST-with-ost inf: lpurge-$FS-OST$OST ost$INDEX-$FS
 order lpurge-$FS-$OST-after-ost ost$INDEX-$FS lpurge-$FS-OST$OST
 rsc_ticket ticket-$FS-hotpool-allocated-lpurge-$FS-OST$OST $FS-hotpool-allocated: lpurge-$FS-OST$OST loss-policy=stop
 EOF"
@@ -297,6 +296,10 @@ if [[ "${SORTED_VERSIONS[0]}" == "$MIN_RA_VER" ]]; then
 location hot-pools-prefer-recovered-$FS-OST$OST lpurge-$FS-OST$OST \
         rule -inf: not_defined OST$OST-$FS-recovered or OST$OST-$FS-recovered eq false
 EOF"
+else
+    clush -qS --group=ha_heads "crm_resource -QW -r ost$INDEX-$FS >/dev/null 2>&1 && crm configure << EOF || true
+colocation lpurge-$FS-$OST-with-ost inf: lpurge-$FS-OST$OST ost$INDEX-$FS
+EOF"
 fi
 done
 
@@ -362,7 +365,6 @@ EOF
     echo Creating lamigo resource for $MDT
     clush -qS --group=ha_heads "crm_resource -QW -r mdt$INDEX-$FS >/dev/null 2>&1 && crm configure << EOF || true
 primitive lamigo-$MDT systemd:lamigo@$MDT.service op monitor interval=30s op start timeout=15m op stop timeout=120s
-colocation lamigo-$MDT-with-mdt inf: lamigo-$MDT mdt$INDEX-$FS
 order lamigo-$MDT-after-mdt mdt$INDEX-$FS lamigo-$MDT
 rsc_ticket ticket-$FS-hotpool-allocated-lamigo-$MDT $FS-hotpool-allocated: lamigo-$MDT loss-policy=stop
 EOF"
@@ -372,6 +374,10 @@ if [[ "${SORTED_VERSIONS[0]}" == "$MIN_RA_VER" ]]; then
 location hot-pools-prefer-recovered-$MDT lamigo-$MDT \
         rule -inf: not_defined $MDTATTR or $MDTATTR eq false
 EOF"
+else
+    clush -qS --group=ha_heads "crm_resource -QW -r mdt$INDEX-$FS >/dev/null 2>&1 && crm configure << EOF || true
+colocation lamigo-$MDT-with-mdt inf: lamigo-$MDT mdt$INDEX-$FS
+EOF"
 fi
 done