diff --git a/.github/workflows/release-drbd9-images.yml b/.github/workflows/release-drbd9-images.yml index 1661379..c22a121 100644 --- a/.github/workflows/release-drbd9-images.yml +++ b/.github/workflows/release-drbd9-images.yml @@ -5,6 +5,7 @@ on: branches: [ "main" ] paths: - 'docker-drbd9/**' + - "helm/drbd-adapter/Chart.yaml" - '.github/workflow/release-drbd9-images.yml' jobs: diff --git a/.github/workflows/release-shipper-images.yml b/.github/workflows/release-shipper-images.yml index 6702b34..93df8ad 100644 --- a/.github/workflows/release-shipper-images.yml +++ b/.github/workflows/release-shipper-images.yml @@ -5,6 +5,7 @@ on: branches: [ "main" ] paths: - 'docker-shipper/*' + - "helm/drbd-adapter/Chart.yaml" - '.github/workflow/release-shipper-images.yml' jobs: diff --git a/docker-drbd9/entry.sh b/docker-drbd9/entry.sh index 9099edf..f65ad13 100644 --- a/docker-drbd9/entry.sh +++ b/docker-drbd9/entry.sh @@ -233,7 +233,7 @@ if grep -q '^drbd ' /proc/modules; then [[ $LB_FAIL_IF_USERMODE_HELPER_NOT_DISABLED == yes ]] && ! grep -qw disabled /sys/module/drbd/parameters/usermode_helper && die "- load the drbd module on the host with the module parameter 'usermode_helper=disabled' OR\n- let this container handle that for you by not already loading the drbd module on the host" - + export DRBD_EXIST='yes' exit 0 fi diff --git a/docker-shipper/entrypoint.adapter.sh b/docker-shipper/entrypoint.adapter.sh index d018e5f..cfa8cd7 100755 --- a/docker-shipper/entrypoint.adapter.sh +++ b/docker-shipper/entrypoint.adapter.sh @@ -52,12 +52,17 @@ fi ## Main Logic # If no shipped module is found, then compile from source +export DRBD_EXIST='no' +echo "OS_KERNEL:$1" export OS_KERNEL=$1 if LB_HOW=shipped_modules bash -x /entry.sh ; then echo "Successfully loaded shipped module" elif LB_HOW=compile bash -x /entry.sh ; then echo "Successfully loaded compiled module" fi + +echo "DRBD_EXIST:$DRBD_EXIST" +echo "DRBD_RMP_INSTALL:$DRBD_RMP_INSTALL" #If the installation through rpm is successful, exit directly. if [[ $DRBD_RMP_INSTALL == 'yes' ]];then echo "Successfully installed rbd using rpm package"