You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2014/07/16 17:30:37 UTC

git commit: AMBARI-6505. RM HA: Create Step1. (akovalenko)

Repository: ambari
Updated Branches:
  refs/heads/trunk 8f2f5bcde -> 74fac8a26


AMBARI-6505. RM HA: Create Step1. (akovalenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/74fac8a2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/74fac8a2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/74fac8a2

Branch: refs/heads/trunk
Commit: 74fac8a264b74ead25625ed1875a9b5f4ae20563
Parents: 8f2f5bc
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Wed Jul 16 18:25:35 2014 +0300
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Wed Jul 16 18:28:41 2014 +0300

----------------------------------------------------------------------
 ambari-web/app/messages.js                                       | 4 ++++
 .../main/admin/highAvailability/resourceManager/step1.hbs        | 4 ++++
 2 files changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/74fac8a2/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 75dfa29..c9b23fb 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -975,6 +975,10 @@ Em.I18n.translations = {
 
   'admin.rm_highAvailability.wizard.header': 'Enable ResourceManager HA Wizard',
   'admin.rm_highAvailability.wizard.step1.header': 'Get Started',
+  'admin.rm_highAvailability.wizard.step1.body':'This wizard will walk you through enabling ResourceManager HA on your cluster.<br/>' +
+      'Once enabled, you will be running a Standby ResourceManager in addition to your Active ResourceManager.<br/>' +
+      'This allows for an Active-Standby ResourceManager configuration that automatically performs failover.<br/><br/>' +
+      '<b>You should plan a cluster maintenance window and prepare for cluster downtime when enabling ResourceManager HA.</b>',
   'admin.rm_highAvailability.wizard.step2.header': 'Select Host',
   'admin.rm_highAvailability.wizard.step3.header': 'Review',
   'admin.rm_highAvailability.wizard.step4.header': 'Configure Components',

http://git-wip-us.apache.org/repos/asf/ambari/blob/74fac8a2/ambari-web/app/templates/main/admin/highAvailability/resourceManager/step1.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/highAvailability/resourceManager/step1.hbs b/ambari-web/app/templates/main/admin/highAvailability/resourceManager/step1.hbs
index 9c6f916..e3e115b 100644
--- a/ambari-web/app/templates/main/admin/highAvailability/resourceManager/step1.hbs
+++ b/ambari-web/app/templates/main/admin/highAvailability/resourceManager/step1.hbs
@@ -18,6 +18,10 @@
 <div>
   <h2>{{t admin.rm_highAvailability.wizard.step1.header}}</h2>
 
+  <div class="alert alert-info">
+    {{t admin.rm_highAvailability.wizard.step1.body}}
+  </div>
+
   <div class="btn-area">
     <a class="btn btn-success pull-right" {{action next}}>{{t common.next}} &rarr;</a>
   </div>