Merge pull request #21 from jplock/jp-fixes

[fix] fix references
aws-samples · Feb 13, 2025 · 85c0d06 · 85c0d06
2 parents dd1f12b + 9faaebe
commit 85c0d06
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/template.yml b/template.yml
@@ -653,7 +653,10 @@ Resources:
       Description: "DO NOT DELETE - Organization Activation Function"
       Environment:
         Variables:
-          ROOT_ID: !GetAtt rOrganization.RootId
+          ROOT_ID: !If
+            - cHasOrganizationRootId
+            - !Ref pOrganizationRootId
+            - !GetAtt rOrganization.RootId
       Handler: index.handler
       MemorySize: 1024  # megabytes
       PropagateTags: true
@@ -737,7 +740,10 @@ Resources:
       StackInstancesGroup:
         - DeploymentTargets:
             OrganizationalUnitIds:
-              - !GetAtt rOrganization.RootId
+              - !If
+                - cHasOrganizationRootId
+                - !Ref pOrganizationRootId
+                - !GetAtt rOrganization.RootId
           Regions:
             - !Ref "AWS::Region"  # single region only for the IAM roles
       StackSetName: AWSPlatform-BASELINE-ROLES