Fix for renamed main file in db/slurm_accounting_db. Fix to not use region or partition in TemplateURLs in pcluster/slurm_accounting_with_email

Author: mwvaughn

recipes/pcluster/slurm_accounting/assets/launch-alt.yaml

@@ -159,7 +159,7 @@ Resources:
         DatabaseClusterSubnetOne: {"Fn::Select": [0, !Ref DatabaseSubnetIds]}
         DatabaseClusterSubnetTwo: {"Fn::Select": [1, !Ref DatabaseSubnetIds]}
       TemplateURL: !Sub
-        - https://aws-hpc-recipes.s3.us-east-1.amazonaws.com/${Version}/recipes/db/slurm_accounting_db/assets/serverless-database.yaml
+        - https://aws-hpc-recipes.s3.us-east-1.amazonaws.com/${Version}/recipes/db/slurm_accounting_db/assets/main.yaml
         - { Version: !FindInMap [Recipes, Constants, Version] }
       TimeoutInMinutes: 60  
 

recipes/pcluster/slurm_accounting/assets/launch.yaml

@@ -144,7 +144,7 @@ Resources:
         DatabaseClusterSubnetOne: {"Fn::Select": [0, { "Fn::Split" : [",", {"Fn::ImportValue" : {"Fn::Sub" : "${NetworkStackNameParameter}-PrivateSubnets"}}] }]}
         DatabaseClusterSubnetTwo: {"Fn::Select": [1, { "Fn::Split" : [",", {"Fn::ImportValue" : {"Fn::Sub" : "${NetworkStackNameParameter}-PrivateSubnets"}}] }]}
       TemplateURL: !Sub
-        - https://aws-hpc-recipes.s3.us-east-1.amazonaws.com/${Version}/recipes/db/slurm_accounting_db/assets/serverless-database.yaml
+        - https://aws-hpc-recipes.s3.us-east-1.amazonaws.com/${Version}/recipes/db/slurm_accounting_db/assets/main.yaml
         - { Version: !FindInMap [Recipes, Constants, Version] }
       TimeoutInMinutes: 60  
 

recipes/pcluster/slurm_accounting_with_email/assets/launch-sms.yaml

@@ -354,7 +354,7 @@ Resources:
         DatabaseClusterSubnetOne: {"Fn::Select": [0, { "Fn::Split" : [",", {"Fn::ImportValue" : {"Fn::Sub" : "${NetworkStackNameParameter}-PrivateSubnets"}}] }]}
         DatabaseClusterSubnetTwo: {"Fn::Select": [1, { "Fn::Split" : [",", {"Fn::ImportValue" : {"Fn::Sub" : "${NetworkStackNameParameter}-PrivateSubnets"}}] }]}
       TemplateURL: !Sub
-        - https://aws-hpc-recipes.s3.${AWS::Region}.${AWS::URLSuffix}/${Version}/recipes/db/slurm_accounting_db/assets/serverless-database.yaml
+        - https://aws-hpc-recipes.s3.us-east-1.amazonaws.com/${Version}/recipes/db/slurm_accounting_db/assets/main.yaml
         - { Version: !FindInMap [Recipes, Constants, Version] }
       TimeoutInMinutes: 60  
 
@@ -383,7 +383,7 @@ Resources:
           CustomActions:
             OnNodeConfigured:
               Script: !Sub
-                - https://aws-hpc-recipes.s3.${AWS::Region}.${AWS::URLSuffix}/${Version}/recipes/pcluster/slurm_accounting_with_email/assets/postinstall.sh
+                - https://aws-hpc-recipes.s3.us-east-1.amazonaws.com/${Version}/recipes/pcluster/slurm_accounting_with_email/assets/postinstall.sh
                 - { Version: !FindInMap [Recipes, Constants, Version] }
               Args:
                 - "-c"

recipes/pcluster/slurm_accounting_with_email/assets/launch.yaml

@@ -175,7 +175,7 @@ Resources:
         DatabaseClusterSubnetOne: {"Fn::Select": [0, { "Fn::Split" : [",", {"Fn::ImportValue" : {"Fn::Sub" : "${NetworkStackNameParameter}-PrivateSubnets"}}] }]}
         DatabaseClusterSubnetTwo: {"Fn::Select": [1, { "Fn::Split" : [",", {"Fn::ImportValue" : {"Fn::Sub" : "${NetworkStackNameParameter}-PrivateSubnets"}}] }]}
       TemplateURL: !Sub
-        - https://aws-hpc-recipes.s3.${AWS::Region}.${AWS::URLSuffix}/${Version}/recipes/db/slurm_accounting_db/assets/serverless-database.yaml
+        - https://aws-hpc-recipes.s3.us-east-1.amazonaws.com/${Version}/recipes/db/slurm_accounting_db/assets/main.yaml
         - { Version: !FindInMap [Recipes, Constants, Version] }
       TimeoutInMinutes: 60  
 
@@ -204,7 +204,7 @@ Resources:
           CustomActions:
             OnNodeConfigured:
               Script: !Sub
-                - https://aws-hpc-recipes.s3.${AWS::Region}.${AWS::URLSuffix}/${Version}/recipes/pcluster/slurm_accounting_with_email/assets/postinstall.sh
+                - https://aws-hpc-recipes.s3.us-east-1.amazonaws.com/${Version}/recipes/pcluster/slurm_accounting_with_email/assets/postinstall.sh
                 - { Version: !FindInMap [Recipes, Constants, Version] }
               Args:
                 - "-c"