Browse Source

Expose console config for customization

Diego Castro 9 years ago
parent
commit
a0c9c51f8f

+ 6 - 1
roles/openshift_master/tasks/main.yml

@@ -42,7 +42,12 @@
       public_console_url: "{{ openshift_master_public_console_url | default(None) }}"
       logging_public_url: "{{ openshift_master_logging_public_url | default(None) }}"
       metrics_public_url: "{{ openshift_master_metrics_public_url | default(None) }}"
-      etcd_hosts: "{{ openshift_master_etcd_hosts | default(None)}}"
+      logout_url: "{{ openshift_master_logout_url | default(None) }}"
+      extension_scripts: "{{ openshift_master_extension_scripts | default(None) }}"
+      extension_stylesheets: "{{ openshift_master_extension_stylesheets | default(None) }}"
+      extensions: "{{ openshift_master_extensions | default(None) }}"
+      oauth_template: "{{ openshift_master_oauth_template | default(None) }}"
+      etcd_hosts: "{{ openshift_master_etcd_hosts | default(None) }}"
       etcd_port: "{{ openshift_master_etcd_port | default(None) }}"
       etcd_use_ssl: "{{ openshift_master_etcd_use_ssl | default(None) }}"
       etcd_urls: "{{ openshift_master_etcd_urls | default(None) }}"

+ 14 - 1
roles/openshift_master/templates/master.yaml.v1.j2

@@ -5,7 +5,7 @@ apiLevels:
 - v1
 apiVersion: v1
 assetConfig:
-  logoutURL: ""
+  logoutURL: "{{ openshift.master.logout_url | default('') }}"
   masterPublicURL: {{ openshift.master.public_api_url }}
   publicURL: {{ openshift.master.public_console_url }}/
 {% if 'logging_public_url' in openshift.master %}
@@ -14,6 +14,15 @@ assetConfig:
 {% if 'metrics_public_url' in openshift.master %}
   metricsPublicURL: {{ openshift.master.metrics_public_url }}
 {% endif %}
+{% if 'extension_scripts' in openshift.master %}
+  extensionScripts: {{ openshift.master.extension_scripts | to_padded_yaml(1, 2) }}
+{% endif %}
+{% if 'extension_stylesheets' in openshift.master %}
+  extensionStylesheets: {{ openshift.master.extension_stylesheets | to_padded_yaml(1, 2) }}
+{% endif %}
+{% if 'extensions' in openshift.master %}
+  extensions: {{ openshift.master.extensions | to_padded_yaml(1, 2) }}
+{% endif %}
   servingInfo:
     bindAddress: {{ openshift.master.bind_addr }}:{{ openshift.master.console_port }}
     bindNetwork: tcp4
@@ -114,6 +123,10 @@ networkConfig:
 # serviceNetworkCIDR must match kubernetesMasterConfig.servicesSubnet
   serviceNetworkCIDR: {{ openshift.master.portal_net }}
 oauthConfig:
+{% if 'oauth_template' in openshift.master %}
+  templates:
+    login: {{ openshift.master.oauth_template }}
+{% endif %}
   assetPublicURL: {{ openshift.master.public_console_url }}/
   grantConfig:
     method: {{ openshift.master.oauth_grant_method }}