diff --git a/specs/default/cluster-init/files/install-non-scheduler.sh b/specs/default/cluster-init/files/install-non-scheduler.sh index 3aff8a19..3711f60f 100644 --- a/specs/default/cluster-init/files/install-non-scheduler.sh +++ b/specs/default/cluster-init/files/install-non-scheduler.sh @@ -5,7 +5,7 @@ mode=$1 echo $mode | grep -Eqw "login|execute" || (echo "Usage: $0 [login|execute]" && exit 1) do_install=$(jetpack config slurm.do_install True) -install_pkg=$(jetpack config slurm.install_pkg azure-slurm-install-pkg-4.0.5.tar.gz) +install_pkg=$(jetpack config slurm.install_pkg azure-slurm-install-pkg-4.0.6.tar.gz) slurm_project_name=$(jetpack config slurm.project_name slurm) diff --git a/specs/scheduler/cluster-init/scripts/00-install.sh b/specs/scheduler/cluster-init/scripts/00-install.sh index a661d713..4a20e025 100644 --- a/specs/scheduler/cluster-init/scripts/00-install.sh +++ b/specs/scheduler/cluster-init/scripts/00-install.sh @@ -2,8 +2,8 @@ set -e do_install=$(jetpack config slurm.do_install True) -install_pkg=$(jetpack config slurm.install_pkg azure-slurm-install-pkg-4.0.5.tar.gz) -autoscale_pkg=$(jetpack config slurm.autoscale_pkg azure-slurm-pkg-4.0.5.tar.gz) +install_pkg=$(jetpack config slurm.install_pkg azure-slurm-install-pkg-4.0.6.tar.gz) +autoscale_pkg=$(jetpack config slurm.autoscale_pkg azure-slurm-pkg-4.0.6.tar.gz) slurm_project_name=$(jetpack config slurm.project_name slurm) find_python3() { diff --git a/templates/slurm-cs.txt b/templates/slurm-cs.txt index ebc423a2..6316109f 100644 --- a/templates/slurm-cs.txt +++ b/templates/slurm-cs.txt @@ -22,9 +22,6 @@ Autoscale = $Autoscale [[[configuration]]] - slurm.install_pkg = azure-slurm-install-pkg-4.0.5.tar.gz - slurm.autoscale_pkg = azure-slurm-pkg-4.0.5.tar.gz - slurm.version = $configuration_slurm_version slurm.accounting.enabled = $configuration_slurm_accounting_enabled slurm.accounting.url = $configuration_slurm_accounting_url @@ -40,7 +37,7 @@ Autoscale = $Autoscale # For fast spin-up after Deallocate, force an immediate re-converge on boot cyclecloud.converge_on_boot = false - [[[cluster-init cyclecloud/slurm:default:4.0.5]]] + [[[cluster-init cyclecloud/slurm:default]]] Optional = true diff --git a/templates/slurm.txt b/templates/slurm.txt index 1d618e61..8628569e 100644 --- a/templates/slurm.txt +++ b/templates/slurm.txt @@ -71,7 +71,7 @@ Autoscale = $Autoscale [[[cluster-init cyclecloud/healthagent:default]]] [[[cluster-init cyclecloud/monitoring:default]]] - [[[cluster-init cyclecloud/slurm:default:4.0.5]]] + [[[cluster-init cyclecloud/slurm:default]]] [[[volume boot]]] Size = ${ifThenElse(BootDiskSize > 0, BootDiskSize, undefined)} @@ -126,7 +126,7 @@ Autoscale = $Autoscale [[[cluster-init cyclecloud/healthagent:default]]] [[[cluster-init cyclecloud/monitoring:default]]] - [[[cluster-init cyclecloud/slurm:scheduler:4.0.5]]] + [[[cluster-init cyclecloud/slurm:scheduler]]] [[[network-interface eth0]]] AssociatePublicIpAddress = $UsePublicNetwork @@ -191,7 +191,7 @@ Autoscale = $Autoscale [[[cluster-init cyclecloud/healthagent:default]]] [[[cluster-init cyclecloud/monitoring:default]]] - [[[cluster-init cyclecloud/slurm:login:4.0.5]]] + [[[cluster-init cyclecloud/slurm:login]]] [[[configuration]]] slurm.role = login autoscale.enabled = false @@ -209,7 +209,7 @@ Autoscale = $Autoscale [[[cluster-init cyclecloud/healthagent:default]]] [[[cluster-init cyclecloud/monitoring:default]]] - [[[cluster-init cyclecloud/slurm:execute:4.0.5]]] + [[[cluster-init cyclecloud/slurm:execute]]] [[[network-interface eth0]]] AssociatePublicIpAddress = $ExecuteNodesPublic