Merge pull request GoogleCloudPlatform#4258 from mr0re1/fix_tpl

mr0re1 · web-flow · commit c8201155ce0b · 2025-06-10T09:11:12.000-07:00
Fix templates to point to right AccountingStorageHost
diff --git a/community/modules/scheduler/schedmd-slurm-gcp-v6-controller/etc/htc-slurm.conf.tpl b/community/modules/scheduler/schedmd-slurm-gcp-v6-controller/etc/htc-slurm.conf.tpl
@@ -50,7 +50,7 @@ StateSaveLocation={state_save}
 #
 # LOGGING AND ACCOUNTING
 AccountingStorageType=accounting_storage/slurmdbd
-AccountingStorageHost={control_host}
+AccountingStorageHost={accounting_storage_host}
 ClusterName={name}
 SlurmctldLogFile={slurmlog}/slurmctld.log
 SlurmdLogFile={slurmlog}/slurmd-%n.log
diff --git a/community/modules/scheduler/schedmd-slurm-gcp-v6-controller/etc/long-prolog-slurm.conf.tpl b/community/modules/scheduler/schedmd-slurm-gcp-v6-controller/etc/long-prolog-slurm.conf.tpl
@@ -56,7 +56,7 @@ StateSaveLocation={state_save}
 #
 # LOGGING AND ACCOUNTING
 AccountingStorageType=accounting_storage/slurmdbd
-AccountingStorageHost={control_host}
+AccountingStorageHost={accounting_storage_host}
 ClusterName={name}
 SlurmctldLogFile={slurmlog}/slurmctld.log
 SlurmdLogFile={slurmlog}/slurmd-%n.log

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ StateSaveLocation={state_save}`
`50`	`50`	`#`
`51`	`51`	`# LOGGING AND ACCOUNTING`
`52`	`52`	`AccountingStorageType=accounting_storage/slurmdbd`
`53`		`-AccountingStorageHost={control_host}`
	`53`	`+AccountingStorageHost={accounting_storage_host}`
`54`	`54`	`ClusterName={name}`
`55`	`55`	`SlurmctldLogFile={slurmlog}/slurmctld.log`
`56`	`56`	`SlurmdLogFile={slurmlog}/slurmd-%n.log`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ StateSaveLocation={state_save}`
`56`	`56`	`#`
`57`	`57`	`# LOGGING AND ACCOUNTING`
`58`	`58`	`AccountingStorageType=accounting_storage/slurmdbd`
`59`		`-AccountingStorageHost={control_host}`
	`59`	`+AccountingStorageHost={accounting_storage_host}`
`60`	`60`	`ClusterName={name}`
`61`	`61`	`SlurmctldLogFile={slurmlog}/slurmctld.log`
`62`	`62`	`SlurmdLogFile={slurmlog}/slurmd-%n.log`