Add missing condition for MasterPublicIp Output

The Master Public IP from the MasterServer resource
is only available if MasterPublicIp condition is verified.

We lost this condition when created two substacks
for the master and the computes.

Signed-off-by: Enrico Usai <[email protected]>

Author: Enrico Usai

cloudformation/aws-parallelcluster.cfn.json

@@ -2790,6 +2790,13 @@
           "MasterENI": {
             "Ref": "MasterENI"
           },
+          "MasterPublicIp": {
+            "Fn::If": [
+              "MasterPublicIp",
+              true,
+              false
+            ]
+          },
           "ImageId": {
             "Fn::If": [
               "UseCustomAMI",

cloudformation/master-server-substack.cfn.yaml

@@ -24,6 +24,8 @@ Parameters:
     Type: String
   MasterENI:
     Type: String
+  MasterPublicIp:
+    Type: String
   ImageId:
     Type: AWS::EC2::Image::Id
   IamInstanceProfile:
@@ -219,6 +221,9 @@ Conditions:
     - !Equals
       - !Ref 'UpdateWaiterFunctionArn'
       - NONE
+  MasterPublicIp: !Equals
+    - !Ref 'MasterPublicIp'
+    - 'true'
 Resources:
   MasterServer:
     Type: AWS::EC2::Instance
@@ -622,6 +627,7 @@ Outputs:
   MasterPublicIP:
     Description: Public IP Address of the Master host
     Value: !GetAtt 'MasterServer.PublicIp'
+    Condition: MasterPublicIp
   MasterPrivateDnsName:
     Description: Private DNS name of the Master host
     Value: !GetAtt 'MasterServer.PrivateDnsName'