Fix deployment of multiple Batch jobs

Two issues:

1. The submit_script_output_path did not depend on the
ID of the job to be submitted, so one job's submit script could
overwrite a different job's submit script.

2. The submit_job resource did not explicitly depend on the submit_script
resource and as a result would sometimes execute before the script
was written (causing submisison to fail with a file-not-found error).

modules/scheduler/batch-job-template/main.tf

@@ -54,7 +54,7 @@ locals {
       submit_job_id = local.submit_job_id
     }
   )
-  submit_script_output_path = "${path.root}/submit-job.sh"
+  submit_script_output_path = "${path.root}/submit-${local.submit_job_id}.sh"
 
   subnetwork_name    = var.subnetwork != null ? var.subnetwork.name : "default"
   subnetwork_project = var.subnetwork != null ? var.subnetwork.project : var.project_id
@@ -117,7 +117,7 @@ resource "local_file" "submit_script" {
 }
 
 resource "null_resource" "submit_job" {
-  depends_on = [local_file.job_template]
+  depends_on = [local_file.job_template, local_file.submit_script]
   count      = var.submit ? 1 : 0
 
   # A new deployment should always submit a new job. Old finished jobs aren't persistent parts of