Merge "Horizon: Expose additional security config params"

horizon/templates/deployment.yaml

@@ -66,6 +66,11 @@ spec:
           command:
             - /tmp/horizon.sh
             - start
+          env:
+          - name: MY_POD_IP
+            valueFrom:
+              fieldRef:
+                fieldPath: status.podIP
           lifecycle:
             preStop:
               exec:

horizon/values.yaml

@@ -194,6 +194,9 @@ conf:
         secure_proxy_ssl_header: false
         password_autocomplete: "off"
         disallow_iframe_embed: "False"
+        allowed_hosts:
+          - '*'
+        horizon_images_upload_mode: 'legacy'
         openstack_cinder_features:
           enable_backup: "True"
         openstack_neutron_network:
@@ -249,7 +252,7 @@ conf:
         # with the list of host/domain names that the application can serve.
         # For more information see:
         # https://docs.djangoproject.com/en/dev/ref/settings/#allowed-hosts
-        ALLOWED_HOSTS = ['*']
+        ALLOWED_HOSTS = [{{ include "helm-toolkit.utils.joinListWithCommaAndSingleQuotes" .Values.conf.horizon.local_settings.config.allowed_hosts }},'%s' % (os.environ.get("MY_POD_IP"))]
 
         # Set SSL proxy settings:
         # For Django 1.4+ pass this header from the proxy after terminating the SSL,
@@ -542,6 +545,12 @@ conf:
         # table.
         IMAGE_RESERVED_CUSTOM_PROPERTIES = []
 
+        # Set to 'legacy' or 'direct' to allow users to upload images to glance via
+        # Horizon server. When enabled, a file form field will appear on the create
+        # image form. If set to 'off', there will be no file form field on the create
+        # image form. See documentation for deployment considerations.
+        HORIZON_IMAGES_UPLOAD_MODE = '{{ .Values.conf.horizon.local_settings.config.horizon_images_upload_mode }}'
+
         # 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'.