Merge "standalone/undercloud - post: use EndpointMap to fetch Keystone URL"

ci/common/vbmc_setup.yaml

@@ -3,6 +3,11 @@ heat_template_version: rocky
 parameters:
   servers:
     type: json
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
 
 resources:
 

common/deploy-steps.j2

@@ -231,6 +231,7 @@ resources:
     type: OS::TripleO::NodeExtraConfigPost
     properties:
         servers: {get_param: [servers, {{role.name}}]}
+        EndpointMap: {get_param: EndpointMap}
 
   # The {{role.name}}PostConfig steps are in charge of
   # quiescing all services, i.e. in the Controller case,

extraconfig/post_deploy/default.yaml

@@ -3,3 +3,8 @@ description: 'Extra Post Deployment Config'
 parameters:
   servers:
     type: json
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json

extraconfig/post_deploy/standalone_post.yaml

@@ -17,17 +17,6 @@ parameters:
     type: string
     description: The password for the keystone admin account, used for monitoring, querying neutron etc.
     hidden: True
-  SSLCertificate:
-    description: >
-      The content of the SSL certificate (without Key) in PEM format.
-    type: string
-    default: ""
-    hidden: True
-  PublicSSLCertificateAutogenerated:
-    default: false
-    description: >
-      Whether the public SSL certificate was autogenerated or not.
-    type: boolean
   KeystoneRegion:
     type: string
     default: 'regionOne'
@@ -40,18 +29,11 @@ parameters:
     type: string
     description: The python interpreter to use for python and ansible actions
     default: /usr/bin/python
-
-conditions:
-
-  tls_enabled:
-    or:
-    - not:
-        equals:
-        - {get_param: SSLCertificate}
-        - ""
-    - equals:
-        - {get_param: PublicSSLCertificateAutogenerated}
-        - true
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
 
 resources:
 
@@ -108,19 +90,7 @@ resources:
       config: {get_resource: CloudsYamlConfig}
       input_values:
         admin_password: {get_param: AdminPassword}
-        auth_url:
-          if:
-          - 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: /
+        auth_url: {get_param: [EndpointMap, KeystonePublic, uri_no_suffix]}
         cloud_name: {get_param: StandaloneCloudName}
         home_dir: {get_param: StandaloneHomeDir}
         identity_api_version: 3

extraconfig/post_deploy/undercloud_post.yaml

@@ -79,6 +79,11 @@ parameters:
     type: string
     default: 'undercloud'
     description: Cloud name for the clouds.yaml
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
 
 conditions:
 
@@ -130,20 +135,7 @@ resources:
           - ca_file_enabled
           - {get_param: InternalTLSCAFile}
           - ''
-        # if SSL is enabled we use the public virtual ip as the stackrc endpoint
-        auth_url:
-          if:
-          - 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: /
+        auth_url: {get_param: [EndpointMap, KeystonePublic, uri_no_suffix]}
 
   CloudsYamlConfig:
     type: OS::Heat::SoftwareConfig
@@ -170,19 +162,7 @@ resources:
       config: {get_resource: CloudsYamlConfig}
       input_values:
         admin_password: {get_param: AdminPassword}
-        auth_url:
-          if:
-          - 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: /
+        auth_url: {get_param: [EndpointMap, KeystonePublic, uri_no_suffix]}
         cloud_name: {get_param: UndercloudCloudName}
         home_dir: {get_param: UndercloudHomeDir}
         identity_api_version: 3

releasenotes/notes/endpointmap-8825fcd5fa5a2ba2.yaml

@@ -0,0 +1,7 @@
+---
+other:
+  - |
+    The EndpointMap parameter is now required by post_deploy templates.
+    So if an user overrides OS::TripleO::NodeExtraConfigPost with another
+    template, the template would need to have EndpointMap parameter to work
+    fine.