diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-29 09:17:35 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-29 09:17:35 -0800 |
| commit | 6b1b0a07bc3ffec47021c4c4e77d96defc268b77 (patch) | |
| tree | e82e928acaea149da11e8c8ebada25a51d9f0452 | |
| parent | 2ec70a36f50f670887f2f257d348db6332de5d26 (diff) | |
| parent | c7cf55596e22323ba5ae6abdd1d4c2cdfa06b31d (diff) | |
| download | openshift-6b1b0a07bc3ffec47021c4c4e77d96defc268b77.tar.gz openshift-6b1b0a07bc3ffec47021c4c4e77d96defc268b77.tar.bz2 openshift-6b1b0a07bc3ffec47021c4c4e77d96defc268b77.tar.xz openshift-6b1b0a07bc3ffec47021c4c4e77d96defc268b77.zip | |
Merge pull request #6909 from spadgett/detect-cro
Automatic merge from submit-queue.
Bug 1539182: Detect if ClusterResourceOverrides enabled during console install
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1539182
/assign @sdodson
/cc @jwforres @jupierce
| -rw-r--r-- | roles/openshift_web_console/tasks/install.yml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/roles/openshift_web_console/tasks/install.yml b/roles/openshift_web_console/tasks/install.yml index ff33338a6..f79a05c94 100644 --- a/roles/openshift_web_console/tasks/install.yml +++ b/roles/openshift_web_console/tasks/install.yml @@ -71,6 +71,9 @@ - set_fact: config_to_migrate: "{{ master_config_output.content | b64decode | from_yaml }}" + - set_fact: + cro_plugin_enabled: "{{ config_to_migrate.admissionConfig is defined and config_to_migrate.admissionConfig.pluginConfig is defined and config_to_migrate.admissionConfig.pluginConfig.ClusterResourceOverrides is defined }}" + # Update properties in the config template based on inventory vars when the # asset config does not exist. - name: Set web console config properties from inventory variables @@ -87,7 +90,7 @@ - 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) }}" + value: "{{ openshift_web_console_cluster_resource_overrides_enabled | default(cro_plugin_enabled) }}" - key: extensions#scriptURLs value: "{{ openshift_web_console_extension_script_urls | default([]) }}" - key: extensions#stylesheetURLs @@ -116,6 +119,8 @@ value: "{{ config_to_migrate.assetConfig.servingInfo.maxRequestsInFlight | default(0) }}" - key: servingInfo#requestTimeoutSeconds value: "{{ config_to_migrate.assetConfig.servingInfo.requestTimeoutSeconds | default(0) }}" + - key: features#clusterResourceOverridesEnabled + value: "{{ openshift_web_console_cluster_resource_overrides_enabled | default(cro_plugin_enabled) }}" separator: '#' state: present when: config_to_migrate.assetConfig is defined |