Merge "Add OPENSTACK_ENDPOINT_TYPE value in horizon"

horizon/Chart.yaml

@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Horizon
 name: horizon
-version: 0.2.13
+version: 0.2.14
 home: https://docs.openstack.org/horizon/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Horizon/OpenStack_Project_Horizon_vertical.png
 sources:

horizon/values.yaml

@@ -184,6 +184,7 @@ conf:
         horizon_secret_key: 9aee62c0-5253-4a86-b189-e0fb71fa503c
         debug: "False"
         use_ssl: "False"
+        endpoint_type: "internalURL"
         keystone_multidomain_support: "True"
         keystone_default_domain: Default
         disable_password_reveal: "True"
@@ -580,7 +581,7 @@ conf:
         # OPENSTACK_ENDPOINT_TYPE specifies the endpoint type to use for the endpoints
         # in the Keystone service catalog. Use this setting when Horizon is running
         # external to the OpenStack environment. The default is 'publicURL'.
-        OPENSTACK_ENDPOINT_TYPE = "internalURL"
+        OPENSTACK_ENDPOINT_TYPE = "{{ .Values.conf.horizon.local_settings.config.endpoint_type }}"
 
         # SECONDARY_ENDPOINT_TYPE specifies the fallback endpoint type to use in the
         # case that OPENSTACK_ENDPOINT_TYPE is not present in the endpoints

releasenotes/notes/horizon.yaml

@@ -23,4 +23,5 @@ horizon:
   - 0.2.11 Update htk requirements repo
   - 0.2.12 Support both json and yaml RBAC Policy Format
   - 0.2.13 Add container infra api version in values
+  - 0.2.14 Add OPENSTACK_ENDPOINT_TYPE value
 ...