diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-23 18:43:26 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-23 18:43:26 -0800 |
| commit | 910574ff185c1306f4bb8f1b4eec1191966f9420 (patch) | |
| tree | 8628b518227af13dd0b34513239c77cf64d66050 | |
| parent | cd1c2e70df4fa519e88c75fde154cdc4bfc3b9d6 (diff) | |
| parent | d8c28ccc1d66b6678f6eb370a14593a956c21997 (diff) | |
| download | openshift-910574ff185c1306f4bb8f1b4eec1191966f9420.tar.gz openshift-910574ff185c1306f4bb8f1b4eec1191966f9420.tar.bz2 openshift-910574ff185c1306f4bb8f1b4eec1191966f9420.tar.xz openshift-910574ff185c1306f4bb8f1b4eec1191966f9420.zip | |
Merge pull request #6837 from spadgett/cro
Automatic merge from submit-queue.
Add clusterResourceOverridesEnabled to console config
Adds clusterResourceOverridesEnabled flag to console install.
See https://github.com/openshift/api/pull/32
See https://github.com/openshift/origin/pull/18231
/assign @sdodson
/cc @jwforres
| -rw-r--r-- | files/origin-components/console-config.yaml | 1 | ||||
| -rw-r--r-- | roles/openshift_web_console/tasks/install.yml | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/files/origin-components/console-config.yaml b/files/origin-components/console-config.yaml index 32a28775f..55c650fbe 100644 --- a/files/origin-components/console-config.yaml +++ b/files/origin-components/console-config.yaml @@ -12,6 +12,7 @@ extensions: properties: null features: inactivityTimeoutMinutes: 0 + clusterResourceOverridesEnabled: false servingInfo: bindAddress: 0.0.0.0:8443 bindNetwork: tcp4 diff --git a/roles/openshift_web_console/tasks/install.yml b/roles/openshift_web_console/tasks/install.yml index ead62799a..cc5eef47d 100644 --- a/roles/openshift_web_console/tasks/install.yml +++ b/roles/openshift_web_console/tasks/install.yml @@ -86,6 +86,8 @@ value: "{{ openshift.master.logout_url | default('') }}" - key: features#inactivityTimeoutMinutes value: "{{ openshift_web_console_inactivity_timeout_minutes | default(0) }}" + - key: features#clusterResourceOverridesEnabled + value: "{{ openshift_web_console_cluster_resource_overrides_enabled | default(false) }}" - key: extensions#scriptURLs value: "{{ openshift_web_console_extension_script_urls | default([]) }}" - key: extensions#stylesheetURLs |