You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/06/04 17:38:33 UTC
[1/2] ambari git commit: AMBARI-11693. Service account issues
(alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 36a1c6699 -> f9ed7a3a7
AMBARI-11693. Service account issues (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f9ed7a3a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f9ed7a3a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f9ed7a3a
Branch: refs/heads/trunk
Commit: f9ed7a3a7e285386769486ce704a06628c428048
Parents: 75bce8a
Author: Alex Antonenko <hi...@gmail.com>
Authored: Thu Jun 4 18:08:47 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Thu Jun 4 18:38:26 2015 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/wizard.js | 3 +++
ambari-web/app/utils/config.js | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f9ed7a3a/ambari-web/app/controllers/wizard.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard.js b/ambari-web/app/controllers/wizard.js
index 1177272..6693ff7 100644
--- a/ambari-web/app/controllers/wizard.js
+++ b/ambari-web/app/controllers/wizard.js
@@ -844,6 +844,9 @@ App.WizardController = Em.Controller.extend(App.LocalStorage, App.ThemesMappingM
property.supportsFinal = Boolean(supportsFinal.find(function (configType) {
return property.filename.startsWith(configType);
}));
+ if (property.serviceName == 'MISC' && property.name == 'yarn_user') {
+ property.supportsFinal = false;
+ }
});
loadAdvancedConfigResult.pushObjects(properties);
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/f9ed7a3a/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 15522ac..4b0631b 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -1059,6 +1059,7 @@ App.config = Em.Object.create({
'user_group': 'Hadoop Group',
'mapred_user': 'MapReduce User',
'zk_user': 'ZooKeeper User',
+ 'metadata_user': 'Atlas User',
'ignore_groupsusers_create': 'Skip group modifications during install',
'override_hbase_uid': 'Have Ambari manage UIDs'
};
@@ -1082,7 +1083,6 @@ App.config = Em.Object.create({
}
if (config.property_name == 'proxyuser_group') propertyData.belongsToService = proxyUserGroupServices;
}
-
if (config.property_type.contains('PASSWORD')) {
propertyData.displayType = "password";
}
[2/2] ambari git commit: AMBARI-11686. NameNode HA: going back and
forth between Select Hosts and Review page adds additional NameNodes
(alexantonenko)
Posted by al...@apache.org.
AMBARI-11686. NameNode HA: going back and forth between Select Hosts and Review page adds additional NameNodes (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/75bce8ae
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/75bce8ae
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/75bce8ae
Branch: refs/heads/trunk
Commit: 75bce8aee6fa8b4f68fca1a5aba483553401468a
Parents: 36a1c66
Author: Alex Antonenko <hi...@gmail.com>
Authored: Thu Jun 4 16:35:06 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Thu Jun 4 18:38:26 2015 +0300
----------------------------------------------------------------------
.../admin/highAvailability/nameNode/wizard_controller.js | 5 +++++
ambari-web/app/routes/high_availability_routes.js | 8 ++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/75bce8ae/ambari-web/app/controllers/main/admin/highAvailability/nameNode/wizard_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/wizard_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/wizard_controller.js
index d725bde..ae2fa60 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/wizard_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/wizard_controller.js
@@ -101,6 +101,11 @@ App.HighAvailabilityWizardController = App.WizardController.extend({
this.set('content.masterComponentHosts', masterComponentHosts);
},
+ clearMasterComponentHosts: function() {
+ this.set('content.masterComponentHosts', null);
+ this.setDBProperty('masterComponentHosts', null);
+ },
+
saveHdfsUser: function () {
App.db.setHighAvailabilityWizardHdfsUser(this.get('content.hdfsUser'));
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/75bce8ae/ambari-web/app/routes/high_availability_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/high_availability_routes.js b/ambari-web/app/routes/high_availability_routes.js
index c91929a..1e25ab3 100644
--- a/ambari-web/app/routes/high_availability_routes.js
+++ b/ambari-web/app/routes/high_availability_routes.js
@@ -130,6 +130,10 @@ module.exports = App.WizardRoute.extend({
step2: Em.Route.extend({
route: '/step2',
+ enter: function(router) {
+ var controller = router.get('highAvailabilityWizardController');
+ controller.clearMasterComponentHosts();
+ },
connectOutlets: function (router) {
var controller = router.get('highAvailabilityWizardController');
controller.dataLoading().done(function () {
@@ -137,7 +141,7 @@ module.exports = App.WizardRoute.extend({
controller.loadAllPriorSteps().done(function () {
controller.connectOutlet('highAvailabilityWizardStep2', controller.get('content'));
});
- })
+ });
},
unroutePath: function () {
return false;
@@ -173,7 +177,7 @@ module.exports = App.WizardRoute.extend({
controller.loadAllPriorSteps().done(function () {
controller.connectOutlet('highAvailabilityWizardStep3', controller.get('content'));
});
- })
+ });
},
unroutePath: function () {
return false;