From 3fb905cacb1db36f9c2b22bf52cbef04d7452139 Mon Sep 17 00:00:00 2001 From: Michel Peterson Date: Tue, 25 Mar 2025 07:52:43 +0000 Subject: [PATCH] CR fixes --- .gitignore | 5 +++-- CONTRIBUTING.md | 4 ++-- Vagrantfile | 20 +++++++++++++++++++- {dev => hack}/run.sh | 0 4 files changed, 24 insertions(+), 5 deletions(-) rename {dev => hack}/run.sh (100%) diff --git a/.gitignore b/.gitignore index b945e95..d19bbc7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ **~ node_modules -dev/* +dev /ci/bin/*dev* .vagrant -!dev/run.sh \ No newline at end of file +hack/* +!hack/run.sh \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f9965b6..1da1090 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -31,7 +31,7 @@ To use the devcontainer: > [!Note] > For `iSCSI` it's mandatory to use the Vagrant VM, due to the need of a kernel driver. -> However for other tests the container is probably enough. It's possible to run the `dev/run.sh` +> However for other tests the container is probably enough. It's possible to run the `hack/run.sh` > as explained below in the devcontainer and see if it's possible, before spinning up a full VM. #### 2. System Testing with Vagrant @@ -59,7 +59,7 @@ cd ~/democratic-csi # just configured for your own environment. # You can also create a file `dev/secrets.env` that has `export VARIABLE=VALUE` # and reference those in your `config.yaml` -./dev/run.sh -c ./dev/config.yaml +./hack/run.sh -c ./hack/config.yaml ``` ##### Keeping Files in Sync diff --git a/Vagrantfile b/Vagrantfile index 294ceab..e4bf1e4 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -19,7 +19,25 @@ Vagrant.configure("2") do |config| config.vm.provision "shell", inline: <<-SHELL sudo apt-get update -y - sudo apt-get install -y open-iscsi nodejs git make + + # for building dependecies and executing node + sudo apt-get install -y nodejs git make + + # for app functionality + sudo apt-get install -y netbase socat e2fsprogs xfsprogs fatresize dosfstools nfs-common cifs-utils + + # Install the following system packages + sudo apt-get install -y open-iscsi lsscsi sg3-utils multipath-tools scsitools nvme-cli + + # Enable multipathing + sudo tee /etc/multipath.conf << EOF + defaults { + user_friendly_names yes + find_multipaths yes + } + EOF + + sudo systemctl enable multipath-tools.service # Enable and start iscsid service sudo systemctl enable --now iscsid diff --git a/dev/run.sh b/hack/run.sh similarity index 100% rename from dev/run.sh rename to hack/run.sh