Merge branch '62-generate-only-one-fs-group-default-0' into 'master'

Resolve "Generate only one fs group default.0"

Closes #62

See merge request !33

projects/eos/docker/eos-docker-mgm-init

@@ -23,8 +23,13 @@ eos -b vid enable sss
 eos -b vid enable https
 eos -b vid add gateway $(hostname -s)
 eos -b space define default
-for name in `seq 0 $(($ED_EOS_MAX_NUM_FS-1))`; do eos -b group set default.$name on; done
 
+# Define only one group as startup
+if [ "$ED_EOS_FS_GROUP_PER_DISK" = "0"];then
+    eos -b group set default.0 on
+else
+    for name in `seq 0 $(($ED_EOS_MAX_NUM_FS-1))`; do eos -b group set default.$name on; done
+fi
 # Setting up file scrubbing every 3 weeks ... 
 eos -b space config default space.scaninterval=1814400
 

projects/eos/eos-docker-utils.spec

 Name:           eos-docker-utils
-Version:        1.0.16
+Version:        1.0.17
 Release:        1%{?dist}
 Summary:        EOS docker utils
 License:        LGPL v3+

projects/eos/utils/eos-docker

@@ -430,8 +430,13 @@ function eosDockerFstRegisterDisks() {
       [ $NUM_FS -le 1 ] && { ERROR "No directories in $ED_FST_DATA_PREFIX exists !!!"; exit 21; }
       NUM_FS=$(($NUM_FS-1))
       ED_FST_DATA_PREFIX=${ED_FST_DATA_PREFIX%%+(/)}
+      if [ "$ED_EOS_FS_GROUP_PER_DISK" = "0"];then
+        DEBUG "Doing '$ED_DOCKER_CMD exec eos-$ED_NODE_TYPE eosfstregister -i $ED_FST_DATA_PREFIX/ default:0'"
+        $ED_DOCKER_CMD exec eos-$ED_NODE_TYPE eosfstregister -i $ED_FST_DATA_PREFIX/ default:0 > /dev/null 2>&1
+      else
         DEBUG "Doing '$ED_DOCKER_CMD exec eos-$ED_NODE_TYPE eosfstregister -i $ED_FST_DATA_PREFIX/ default:$NUM_FS'"
         $ED_DOCKER_CMD exec eos-$ED_NODE_TYPE eosfstregister -i $ED_FST_DATA_PREFIX/ default:$NUM_FS > /dev/null 2>&1
+      fi
     elif [ "$t" == "fsts" ];then
       [[ $ED_NODE_TYPE == mgm* ]] &&  [ -f $ED_ROOT_DIR/$ED_FST_HOSTS ]  && eos-docker-ssh disk-sync
     elif [ "$t" == "host" ];then

projects/eos/utils/eos-docker.cf.default

@@ -11,6 +11,7 @@ export ED_DOCKER_IMAGE_NAME_VERSION="$ED_DOCKER_IMAGE_NAME_VERSION"
 
 export ED_FST_DATA_PREFIX="/var/eos/fs"
 export ED_EOS_MAX_NUM_FS="36"
+export ED_EOS_FS_GROUP_PER_DISK="0"
 export ED_EOS_FS_HEADROOM="5G"
 
 export ED_EOS_INSTANCE_NAME="test"