Merge pull request #7200 from mgugino-upstream-stage/webconsole-versi…

…on-check Fix openshift-webconsole version check
openshift · Feb 20, 2018 · a060e22 · a060e22
2 parents 54306e8 + eba040f
commit a060e22
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/playbooks/common/private/components.yml b/playbooks/common/private/components.yml
@@ -20,9 +20,7 @@
 - import_playbook: ../../openshift-hosted/private/config.yml
 
 - import_playbook: ../../openshift-web-console/private/config.yml
-  when:
-    - openshift_web_console_install | default(true) | bool
-    - openshift.common.version_gte_3_9
+  when: openshift_web_console_install | default(true) | bool
 
 - import_playbook: ../../openshift-metrics/private/config.yml
   when: openshift_metrics_install_metrics | default(false) | bool

diff --git a/playbooks/openshift-web-console/private/config.yml b/playbooks/openshift-web-console/private/config.yml
@@ -13,10 +13,13 @@
 
 - name: Web Console
   hosts: oo_first_master
-  roles:
-  - openshift_web_console
   vars:
     first_master: "{{ groups.oo_first_master[0] }}"
+  tasks:
+  - debug: msg="{{ openshift_version | version_compare('3.9', '>=') }}"
+  - import_role:
+      name: openshift_web_console
+    when: openshift_version | version_compare('3.9', '>=')
 
 - name: Web Console Install Checkpoint End
   hosts: all