ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject ambari git commit: AMBARI-12345. Warn the user to not assign Ranger Admin on host where load balancer is located when enabling Ranger Admin HA. (yusaku)
Date Wed, 08 Jul 2015 22:58:52 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 fc0569be6 -> 05a4358ea


AMBARI-12345. Warn the user to not assign Ranger Admin on host where load balancer is located
when enabling Ranger Admin HA. (yusaku)


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

Branch: refs/heads/branch-2.1
Commit: 05a4358eadb477f507e92b6ca64d5b14e7328faf
Parents: fc0569b
Author: Yusaku Sako <yusaku@hortonworks.com>
Authored: Wed Jul 8 15:30:20 2015 -0700
Committer: Yusaku Sako <yusaku@hortonworks.com>
Committed: Wed Jul 8 15:58:40 2015 -0700

----------------------------------------------------------------------
 .../main/admin/highAvailability/rangerAdmin/step2_controller.js  | 4 +++-
 ambari-web/app/messages.js                                       | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/05a4358e/ambari-web/app/controllers/main/admin/highAvailability/rangerAdmin/step2_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/highAvailability/rangerAdmin/step2_controller.js
b/ambari-web/app/controllers/main/admin/highAvailability/rangerAdmin/step2_controller.js
index 1922a98..adecda7 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability/rangerAdmin/step2_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability/rangerAdmin/step2_controller.js
@@ -33,7 +33,9 @@ App.RAHighAvailabilityWizardStep2Controller = Em.Controller.extend(App.Blueprint
 
   mastersAddableInHA: ['RANGER_ADMIN'],
 
-  showInstalledMastersFirst: true
+  showInstalledMastersFirst: true,
+
+  generalWarningMessages: [Em.I18n.t('admin.ra_highAvailability.wizard.step2.warning')]
 
 });
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/05a4358e/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 8c667b0..2799156 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1272,11 +1272,13 @@ Em.I18n.translations = {
   'Once enabled, you will be running a Standby Ranger Admin in addition to your Active Ranger
Admin.<br/>' +
   'This allows for an Active-Standby Ranger Admin configuration that automatically performs
failover.<br/><br/>' +
   '<b>You should plan a cluster maintenance window and prepare for cluster downtime
when enabling Ranger Admin HA.</b><br/><br/>' +
-  'Please setup the load balancer and provide the URL to be used. Make sure that the load
balancer is setup properly before proceeding.',
+  'Please setup the load balancer and provide the URL to be used. Make sure that the load
balancer is setup properly before proceeding.' +
+  '<br/><br/><div class="alert">Be sure that Ranger Admin and load balancer
are located on separate hosts.</div>',
   'admin.ra_highAvailability.wizard.step1.load_balancer_url': 'URL to load balancer',
   'admin.ra_highAvailability.wizard.step1.invalid_url': 'Must be valid URL',
   'admin.ra_highAvailability.wizard.step2.header': 'Select Hosts',
   'admin.ra_highAvailability.wizard.step2.body': 'Select a host or hosts that will be running
the additional Ranger Admin components',
+  'admin.ra_highAvailability.wizard.step2.warning': 'Be sure that load balancer located separately
from Ranger Admin components.',
   'admin.ra_highAvailability.wizard.step3.header': 'Review',
   'admin.ra_highAvailability.wizard.step3.alert_message': '<b>Confirm your host selections.</b>',
   'admin.ra_highAvailability.wizard.step3.currentRA': 'Current Ranger Admin',


Mime
View raw message