Merge branch 'devel' into leo_devel

Signed-off-by: leonidc <[email protected]>

.env

@@ -1,5 +1,5 @@
 # Globals
-VERSION="1.1.0"
+VERSION="1.2.1"
 CEPH_VERSION="18.2.2"
 SPDK_VERSION="23.01.1"
 CONTAINER_REGISTRY="quay.io/ceph"
@@ -59,9 +59,11 @@ SPDK_CENTOS_REPO_VER="9.0-21.el9"
 # Ceph Cluster
 CEPH_CLUSTER_VERSION="${CEPH_VERSION}"
 
+
 CEPH_BRANCH=wip-leonidc-20240407-00
 CEPH_SHA=6232ec868d9cae4f27db805c13cf10205ae88a73
 
+
 CEPH_VSTART_ARGS="--memstore"
 CEPH_DEVEL_MGR_PATH=../ceph
 

.github/workflows/build-container.yml

@@ -131,6 +131,11 @@ jobs:
 
       - name: Start ceph cluster
         run: |
+          if ! docker-compose --version 2>&1 > /dev/null ; then
+            sudo apt update
+            sudo apt install -y docker-compose
+          fi
+          docker-compose --version
           docker-compose up -d ceph
 
       - name: Wait for the ceph cluster container to become healthy
@@ -225,6 +230,11 @@ jobs:
       - name: Start containers
         timeout-minutes: 3
         run: |
+          if ! docker-compose --version 2>&1 > /dev/null ; then
+            sudo apt update
+            sudo apt install -y docker-compose
+          fi
+          docker-compose --version
           make up
 
       - name: Wait for the Gateway to be listening
@@ -367,6 +377,11 @@ jobs:
       - name: Start discovery controller
         if: matrix.integration == 'container'
         run: |
+          if ! docker-compose --version 2>&1 > /dev/null ; then
+            sudo apt update
+            sudo apt install -y docker-compose
+          fi
+          docker-compose --version
           docker-compose up --detach discovery
 
       - name: Wait for discovery controller to be listening
@@ -548,6 +563,11 @@ jobs:
       - name: Start HA with two gateways
         timeout-minutes: 3
         run: |
+          if ! docker-compose --version 2>&1 > /dev/null ; then
+            sudo apt update
+            sudo apt install -y docker-compose
+          fi
+          docker-compose --version
           ./tests/ha/start_up.sh
 
       - name: Wait for gateways to be listening

ceph-nvmeof.conf

@@ -26,6 +26,9 @@ enable_spdk_discovery_controller = False
 #prometheus_bdev_pools = rbd
 #prometheus_stats_interval = 10
 #verify_nqns = True
+#allowed_consecutive_spdk_ping_failures = 1
+#spdk_ping_interval_in_seconds = 2.0
+#ping_spdk_under_lock = False
 
 [gateway-logs]
 log_level=debug