summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-02-12 14:43:51 -0800
committerGitHub <noreply@github.com>2018-02-12 14:43:51 -0800
commit10760235ed1deeed03e9451ec72dfbea63841177 (patch)
tree30439edfa08219be4ca37295e094af441474876d
parent1c9c93d616da65d6121fd34fe0258b45ba909cb8 (diff)
parent7467ce48292e7e70087bfbb98333a4942b091f0b (diff)
downloadopenshift-10760235ed1deeed03e9451ec72dfbea63841177.tar.gz
openshift-10760235ed1deeed03e9451ec72dfbea63841177.tar.bz2
openshift-10760235ed1deeed03e9451ec72dfbea63841177.tar.xz
openshift-10760235ed1deeed03e9451ec72dfbea63841177.zip
Merge pull request #7108 from spadgett/check-version-for-console-install
Automatic merge from submit-queue. Disable console install when not 3.9 or newer Fixes https://github.com/openshift/origin/issues/18573 /assign @sdodson @smarterclayton @stevekuznetsov
-rw-r--r--playbooks/common/private/components.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/playbooks/common/private/components.yml b/playbooks/common/private/components.yml
index 089645d07..739be93c5 100644
--- a/playbooks/common/private/components.yml
+++ b/playbooks/common/private/components.yml
@@ -20,7 +20,9 @@
- import_playbook: ../../openshift-hosted/private/config.yml
- import_playbook: ../../openshift-web-console/private/config.yml
- when: openshift_web_console_install | default(true) | bool
+ when:
+ - openshift_web_console_install | default(true) | bool
+ - openshift.common.version_gte_3_9
- import_playbook: ../../openshift-metrics/private/config.yml
when: openshift_metrics_install_metrics | default(false) | bool