From ef6d01b6c0a4000133ab443a0a3d52d686484fc9 Mon Sep 17 00:00:00 2001
From: Samuel Padgett <spadgett@redhat.com>
Date: Mon, 22 Jan 2018 16:24:02 -0500
Subject: Remove old assetConfig from master-config.yaml

The `assetConfig` is no longer used now that the console is split into
its own pod.

- Remove `assetConfig` on upgrades to 3.9
- Stop writing logging and metrics URLs to assetConfig for 3.9
---
 roles/openshift_logging/tasks/install_logging.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'roles/openshift_logging')

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
-- 
cgit v1.2.3