X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=meta-starlingx%2Fmeta-stx-integ%2Frecipes-support%2Fdrbd%2Fdrbd-utils%2F0005-drbd_reconnect_standby_standalone.patch;fp=meta-starlingx%2Fmeta-stx-integ%2Frecipes-support%2Fdrbd%2Fdrbd-utils%2F0005-drbd_reconnect_standby_standalone.patch;h=0000000000000000000000000000000000000000;hb=e2daf3807eff755f522d07e5947b6080cd31323c;hp=30444c7f6486569d292f32f9f19a96f853668614;hpb=3c9af9e321add34a676d7e71a5ee7e3cb4c8a29d;p=pti%2Frtp.git

diff --git a/meta-starlingx/meta-stx-integ/recipes-support/drbd/drbd-utils/0005-drbd_reconnect_standby_standalone.patch b/meta-starlingx/meta-stx-integ/recipes-support/drbd/drbd-utils/0005-drbd_reconnect_standby_standalone.patch
deleted file mode 100644
index 30444c7..0000000
--- a/meta-starlingx/meta-stx-integ/recipes-support/drbd/drbd-utils/0005-drbd_reconnect_standby_standalone.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: git/scripts/drbd.ocf
-===================================================================
---- git.orig/scripts/drbd.ocf
-+++ git/scripts/drbd.ocf
-@@ -418,6 +418,29 @@ drbd_condition() {
-             rc=$OCF_DATA_OUTDATED
-             ocf_log info "${OCF_RESKEY_drbd_resource} outdated"
-             ;;
-+        Inconsistent)
-+            case "${DRBD_CSTATE}" in
-+                StandAlone)
-+                    rc=$OCF_DATA_STANDALONE
-+                    if [ $status -eq $OCF_SUCCESS ]
-+                    then
-+                        ocf_log info "${OCF_RESKEY_drbd_resource} standby standalone, attempting to reconnect."
-+                        do_drbdadm connect ${OCF_RESKEY_drbd_resource}
-+                    else
-+                        ocf_log info "${OCF_RESKEY_drbd_resource} standalone"
-+                    fi
-+                    ;;
-+                StartingSyncT | WFBitMapT | WFSyncUUID | SyncTarget | \
-+                PausedSyncT)
-+                    rc=$OCF_DATA_SYNC
-+                    ocf_log info "${OCF_RESKEY_drbd_resource} sync"
-+                    ;;
-+                *)
-+                    rc=$OCF_DATA_INCONSISTENT
-+                    ocf_log info "${OCF_RESKEY_drbd_resource} inconsistent"
-+                    ;;
-+            esac
-+            ;;
-         *)
-             case "${DRBD_CSTATE}" in
-                 StandAlone)