AMBARI-20973. Review the use/need of host clean up script. (Ishan Bhatt via Jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ae40bed9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ae40bed9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ae40bed9 Branch: refs/heads/branch-feature-AMBARI-12556 Commit: ae40bed9fc99965babaf3457bbd04758bba99023 Parents: f952c9e Author: Jaimin Jetly <[email protected]> Authored: Fri May 19 10:20:48 2017 -0700 Committer: Jaimin Jetly <[email protected]> Committed: Fri May 19 10:20:48 2017 -0700 ---------------------------------------------------------------------- ambari-web/app/messages.js | 6 +----- .../app/templates/wizard/step3/step3_host_warnings_popup.hbs | 4 +--- 2 files changed, 2 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ae40bed9/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index f34cbdc..0c15a19 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -755,11 +755,7 @@ Em.I18n.translations = { 'installer.step3.hostWarningsPopup.report.user': '<br><br>######################################<br># Users<br>#<br># A space delimited list of users who should not exist.<br># Provided so that administrators can easily copy paths into scripts, email etc.<br># Example: userdel hdfs<br>######################################<br>USERS<br>', 'installer.step3.hostWarningsPopup.report.folder': '\\ /folder', 'installer.step3.hostWarningsPopup.checks': 'Host Checks found', - 'installer.step3.hostWarningsPopup.notice.beginning': 'After manually resolving the issues, click <b>Rerun Checks</b>.' + - '<br>To manually resolve issues on <b>each host</b> run the HostCleanup script (Python 2.6 or greater is required):<br>', - 'installer.step3.hostWarningsPopup.notice.command': 'python /usr/lib/python2.6/site-packages/ambari_agent/HostCleanup.py --silent --skip=users', - 'installer.step3.hostWarningsPopup.notice.end': '<div class="alert alert-warning"><b>Note</b>: Clean up of Firewall and Transparent Huge Page issues are not supported by the HostCleanup script.</div>' + - '<div class="alert alert-warning"><b>Note</b>: To clean up in interactive mode, remove <b>--silent</b> option. To clean up all resources, including <i>users</i>, remove <b>--skip=users</b> option. Use <b>--help</b> for a list of available options.</div>', + 'installer.step3.hostWarningsPopup.notice.beginning': 'After manually resolving the issues, click <b>Rerun Checks</b>.', 'installer.step3.hostWarningsPopup.summary':'{0} on {1}', 'installer.step3.hostWarningsPopup.jdk':'JDK Issues', 'installer.step3.hostWarningsPopup.jdk.name':'JDK not found at <i>{0}</i>', http://git-wip-us.apache.org/repos/asf/ambari/blob/ae40bed9/ambari-web/app/templates/wizard/step3/step3_host_warnings_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/wizard/step3/step3_host_warnings_popup.hbs b/ambari-web/app/templates/wizard/step3/step3_host_warnings_popup.hbs index 07ff31b..e234254 100644 --- a/ambari-web/app/templates/wizard/step3/step3_host_warnings_popup.hbs +++ b/ambari-web/app/templates/wizard/step3/step3_host_warnings_popup.hbs @@ -20,9 +20,7 @@ <div id="host-warnings"> <div class="notice"> <span>{{t installer.step3.hostWarningsPopup.checks}} <b>{{view.warningsNotice}}</b>.<br> - {{t installer.step3.hostWarningsPopup.notice.beginning}} - <div class="code-snippet" {{QAAttr "host-cleanup-script"}}>{{t installer.step3.hostWarningsPopup.notice.command}}</div> - {{t installer.step3.hostWarningsPopup.notice.end}}</span> + {{t installer.step3.hostWarningsPopup.notice.beginning}}</span> </div> <div class="row"> <form class="form-horizontal">
