diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-18 16:24:12 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-18 16:24:12 -0800 |
| commit | 0e4f7c6dd426a9b6c324f854b53d28c8c8c637d0 (patch) | |
| tree | dd8fc8644ff0529fd1375df0768ab2721022e21c | |
| parent | 453027d9c7161b43d6529ba12a83b8d6fa459b72 (diff) | |
| parent | 59e0023654ca1dbad3aec5cb142a693f910daba5 (diff) | |
| download | openshift-0e4f7c6dd426a9b6c324f854b53d28c8c8c637d0.tar.gz openshift-0e4f7c6dd426a9b6c324f854b53d28c8c8c637d0.tar.bz2 openshift-0e4f7c6dd426a9b6c324f854b53d28c8c8c637d0.tar.xz openshift-0e4f7c6dd426a9b6c324f854b53d28c8c8c637d0.zip | |
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
| -rw-r--r-- | roles/openshift_logging/tasks/delete_logging.yaml | 8 | ||||
| -rw-r--r-- | roles/openshift_metrics/tasks/uninstall_metrics.yaml | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/roles/openshift_logging/tasks/delete_logging.yaml b/roles/openshift_logging/tasks/delete_logging.yaml index fbc3e3fd1..00643c80e 100644 --- a/roles/openshift_logging/tasks/delete_logging.yaml +++ b/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 diff --git a/roles/openshift_metrics/tasks/uninstall_metrics.yaml b/roles/openshift_metrics/tasks/uninstall_metrics.yaml index 610c7b4e5..9fa0ad990 100644 --- a/roles/openshift_metrics/tasks/uninstall_metrics.yaml +++ b/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 |