Merge pull request #6775 from spadgett/fix-task-name

Automatic merge from submit-queue.

Bug 1535947: Fix missing task in metrics, logging uninstall playbooks

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1535947

/assign @sdodson

roles/openshift_logging/tasks/delete_logging.yaml

@@ -131,13 +131,13 @@
   when:
     not openshift_logging_install_eventrouter | default(false) | bool
 
-# Update asset config in openshift-web-console namespace
-- name: Remove Kibana route information from web console asset config
+# Update console config in openshift-web-console namespace
+- name: Remove Kibana route information from the web console config
   include_role:
     name: openshift_web_console
-    tasks_from: update_asset_config.yml
+    tasks_from: update_console_config.yml
   vars:
-    asset_config_edits:
+    console_config_edits:
       - key: loggingPublicURL
         value: ""
   when: openshift_web_console_install | default(true) | bool

roles/openshift_metrics/tasks/uninstall_metrics.yaml

@@ -19,13 +19,13 @@
     clusterrolebinding/hawkular-metrics
   changed_when: delete_metrics.stdout != 'No resources found'
 
-# Update asset config in openshift-web-console namespace
-- name: Remove metrics route information from web console asset config
+# Update the web config in openshift-web-console namespace
+- name: Remove metrics route information from the web console config
   include_role:
     name: openshift_web_console
-    tasks_from: update_asset_config.yml
+    tasks_from: update_console_config.yml
   vars:
-    asset_config_edits:
+    console_config_edits:
       - key: metricsPublicURL
         value: ""
   when: openshift_web_console_install | default(true) | bool