Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion specs/default/cluster-init/files/install-non-scheduler.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
4 changes: 2 additions & 2 deletions specs/scheduler/cluster-init/scripts/00-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
5 changes: 1 addition & 4 deletions templates/slurm-cs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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


Expand Down
8 changes: 4 additions & 4 deletions templates/slurm.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading