Undercloud: fix stackrc TLS URL detection

We want to configure a TLS url for the underclouds stackrc
when a user specified or generated TLS certificate is used.
This patch updates the existing check so that
the PublicSSLCertificateAutogenerated paremeter is also used
when deciding if the SSL URL should be enabled.

Change-Id: I7561b5de7749ca57f8ac8056b470228e1026eb31

extraconfig/post_deploy/undercloud_post.yaml

@@ -38,6 +38,11 @@ parameters:
     type: string
     default: ""
     hidden: True
+  PublicSSLCertificateAutogenerated:
+    default: false
+    description: >
+      Whether the public SSL certificate was autogenerated or not.
+    type: boolean
   SnmpdReadonlyUserPassword:
     description: The user password for SNMPd with readonly rights running on all Overcloud nodes
     type: string
@@ -45,7 +50,16 @@ parameters:
 
 conditions:
 
-  ssl_disabled: {equals : [{get_param: SSLCertificate}, ""]}
+  tls_enabled:
+    or:
+    - not:
+        equals:
+        - {get_param: SSLCertificate}
+        - ""
+    - equals:
+        - {get_param: PublicSSLCertificateAutogenerated}
+        - true
+
 
 resources:
 
@@ -86,14 +100,14 @@ resources:
         # if SSL is enabled we use the public virtual ip as the stackrc endpoint
         auth_url:
           if:
-          - ssl_disabled
-          - make_url:
-              scheme: http
-              host: {get_param: [DeployedServerPortMap, 'control_virtual_ip', fixed_ips, 0, ip_address]}
-              port: 5000
-              path: /
+          - tls_enabled
           - make_url:
               scheme: https
               host: {get_param: [DeployedServerPortMap, 'public_virtual_ip', fixed_ips, 0, ip_address]}
               port: 13000
               path: /
+          - make_url:
+              scheme: http
+              host: {get_param: [DeployedServerPortMap, 'control_virtual_ip', fixed_ips, 0, ip_address]}
+              port: 5000
+              path: /