This is an automated email from the ASF dual-hosted git repository.
akovalenko pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 5c2f4fb AMBARI-23378. Closing 'Add New HDFS Namespace' wizard shows
confirmation for RM HA wizard (akovalenko)
5c2f4fb is described below
commit 5c2f4fbb383453d81574b8e2c081a3c3a279ca60
Author: Aleksandr Kovalenko <[email protected]>
AuthorDate: Tue Mar 27 16:55:06 2018 +0300
AMBARI-23378. Closing 'Add New HDFS Namespace' wizard shows confirmation
for RM HA wizard (akovalenko)
---
ambari-web/app/data/configs/wizards/federation_properties.js | 4 ++--
ambari-web/app/messages.js | 1 +
ambari-web/app/routes/namenode_federation_routes.js | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ambari-web/app/data/configs/wizards/federation_properties.js
b/ambari-web/app/data/configs/wizards/federation_properties.js
index d81fe53..9ec419c 100644
--- a/ambari-web/app/data/configs/wizards/federation_properties.js
+++ b/ambari-web/app/data/configs/wizards/federation_properties.js
@@ -77,8 +77,8 @@ module.exports =
"displayName": "dfs.ha.namenodes.{{nameservice2}}",
"description": "The prefix for a given nameservice, contains a
comma-separated list of namenodes for a given nameservice.",
"isReconfigurable": false,
- "recommendedValue": "{{namenode3}},{{namenode4}}",
- "value": "{{namenode3}},{{namenode4}}",
+ "recommendedValue": "nn3,nn4",
+ "value": "nn3,nn4",
"category": "HDFS",
"filename": "hdfs-site",
"serviceName": 'MISC'
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 5341389..40e8101 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1668,6 +1668,7 @@ Em.I18n.translations = {
'admin.nameNodeFederation.button.enable':'Add New HDFS Namespace',
'admin.nameNodeFederation.wizard.header': 'Add New HDFS Namespace',
+ 'admin.nameNodeFederation.closePopup': 'Add New HDFS Namespace Wizard is in
progress. You must allow the wizard to complete for Ambari to be in usable
state. If you choose to quit, you must follow manual instructions to complete
or revert Add New HDFS Namespace as documented in the Ambari User Guide. Are
you sure you want to exit the wizard?',
'admin.nameNodeFederation.wizard.step1.header': 'Get Started',
'admin.nameNodeFederation.wizard.step1.body':'This wizard will walk you
through the process of setting up a new Highly Available NameNode pair that
will be used to create a new HDFS namespace, allowing you to use Ambari to
manage multiple HDFS namespaces and take advantage of HDFS Federation.',
'admin.nameNodeFederation.wizard.step1.alert':'If you have HBase running,
please exit this wizard and stop HBase first.',
diff --git a/ambari-web/app/routes/namenode_federation_routes.js
b/ambari-web/app/routes/namenode_federation_routes.js
index c6ae1ea..732015b 100644
--- a/ambari-web/app/routes/namenode_federation_routes.js
+++ b/ambari-web/app/routes/namenode_federation_routes.js
@@ -35,7 +35,7 @@ module.exports = App.WizardRoute.extend({
classNames: ['wizard-modal-wrapper'],
modalDialogClasses: ['modal-xlg'],
header: Em.I18n.t('admin.nameNodeFederation.wizard.header'),
- bodyClass: App.RMHighAvailabilityWizardView.extend({
+ bodyClass: App.NameNodeFederationWizardView.extend({
controller: nameNodeFederationWizardController
}),
primary: Em.I18n.t('form.cancel'),
@@ -48,7 +48,7 @@ module.exports = App.WizardRoute.extend({
if (parseInt(currStep) === 4) {
App.showConfirmationPopup(function () {
nameNodeFederationWizardController.resetOnClose(nameNodeFederationWizardController,
'main.services.index');
- }, Em.I18n.t('admin.rm_highAvailability.closePopup'));
+ }, Em.I18n.t('admin.nameNodeFederation.closePopup'));
} else {
nameNodeFederationWizardController.resetOnClose(nameNodeFederationWizardController,
'main.services.index');
}
--
To stop receiving notification emails like this one, please contact
[email protected].
