summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging
diff options
context:
space:
mode:
authorDan Yocum <dyocum@redhat.com>2018-01-26 15:39:50 -0500
committerDan Yocum <dyocum@redhat.com>2018-01-26 15:39:50 -0500
commit7dceb6260a333e29c922dad8613ae6a0946fa07b (patch)
tree1c7c40a6c68e0668af2e2a5d0b865a4ef6af371d /roles/openshift_logging
parent501e7897b7becb1e5a5c7875b40675d1e7296ed7 (diff)
parent13e73c31a827d6fca810e120a7b3b6573b2eeb4b (diff)
downloadopenshift-7dceb6260a333e29c922dad8613ae6a0946fa07b.tar.gz
openshift-7dceb6260a333e29c922dad8613ae6a0946fa07b.tar.bz2
openshift-7dceb6260a333e29c922dad8613ae6a0946fa07b.tar.xz
openshift-7dceb6260a333e29c922dad8613ae6a0946fa07b.zip
Merge branch 'master' of github.com:openshift/openshift-ansible into rm_origin-components
Diffstat (limited to 'roles/openshift_logging')
-rw-r--r--roles/openshift_logging/tasks/install_logging.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_logging/tasks/install_logging.yaml b/roles/openshift_logging/tasks/install_logging.yaml
index 3afd8680f..e4883bfa0 100644
--- a/roles/openshift_logging/tasks/install_logging.yaml
+++ b/roles/openshift_logging/tasks/install_logging.yaml
@@ -314,8 +314,8 @@
openshift_logging_install_eventrouter | default(false) | bool
-# TODO: Remove when asset config is removed from master-config.yaml
- include_tasks: update_master_config.yaml
+ when: not openshift.common.version_gte_3_9
# Update asset config in openshift-web-console namespace
- name: Add Kibana route information to web console asset config