Merge pull request #429 from spinolacastro/custom_cors

Custom cors configuration

inventory/byo/hosts.example

@@ -57,6 +57,9 @@ deployment_type=enterprise
 # default subdomain to use for exposed routes
 #osm_default_subdomain=apps.test.example.com
 
+# additional cors origins
+#osm_custom_cors_origins=['foo.example.com', 'bar.example.com'] 
+
 # host group for masters
 [masters]
 ose3-master[1:3]-ansible.test.example.com

roles/openshift_master/tasks/main.yml

@@ -54,6 +54,7 @@
       sdn_cluster_network_cidr: "{{ osm_cluster_network_cidr | default(None) }}"
       sdn_host_subnet_length: "{{ osm_host_subnet_length | default(None) }}"
       default_subdomain: "{{ osm_default_subdomain | default(None) }}"
+      custom_cors_origins: "{{ osm_custom_cors_origins | default(None) }}"
 
 # TODO: These values need to be configurable
 - name: Set dns OpenShift facts

roles/openshift_master/templates/master.yaml.v1.j2

@@ -14,10 +14,12 @@ assetConfig:
     maxRequestsInFlight: 0
     requestTimeoutSeconds: 0
 corsAllowedOrigins:
-{# TODO: add support for user specified corsAllowedOrigins #}
 {% for origin in ['127.0.0.1', 'localhost', openshift.common.hostname, openshift.common.ip, openshift.common.public_hostname, openshift.common.public_ip] %}
   - {{ origin }}
 {% endfor %}
+{% for custom_origin in openshift.master.custom_cors_origins | default("") %}
+  - {{ custom_origin }}
+{% endfor %}
 {% if openshift.master.embedded_dns | bool %}
 dnsConfig:
   bindAddress: {{ openshift.master.bind_addr }}:{{ openshift.master.dns_port }}